fix local movie scanner optimization (#180)

* fix padding odd resolutions

* fix updating plex episode artwork only as needed

ErsatzTV.Application/Artists/ArtistViewModel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace ErsatzTV.Application.Artists
 {
@@ -10,5 +11,6 @@ namespace ErsatzTV.Application.Artists
         string FanArt,
         List<string> Genres,
         List<string> Styles,
-        List<string> Moods);
+        List<string> Moods,
+        List<CultureInfo> Languages);
 }

ErsatzTV.Application/Artists/Mapper.cs

@@ -1,12 +1,16 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using ErsatzTV.Core.Domain;
+using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace ErsatzTV.Application.Artists
 {
     internal static class Mapper
     {
-        internal static ArtistViewModel ProjectToViewModel(Artist artist)
+        internal static ArtistViewModel ProjectToViewModel(Artist artist, List<string> languages)
         {
             ArtistMetadata metadata = Optional(artist.ArtistMetadata).Flatten().Head();
             return new ArtistViewModel(
@@ -17,11 +21,26 @@ namespace ErsatzTV.Application.Artists
                 Artwork(metadata, ArtworkKind.FanArt),
                 metadata.Genres.Map(g => g.Name).ToList(),
                 metadata.Styles.Map(s => s.Name).ToList(),
-                metadata.Moods.Map(m => m.Name).ToList());
+                metadata.Moods.Map(m => m.Name).ToList(),
+                LanguagesForArtist(languages));
         }
 
         private static string Artwork(Metadata metadata, ArtworkKind artworkKind) =>
             Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == artworkKind))
                 .Match(a => a.Path, string.Empty);
+
+        private static List<CultureInfo> LanguagesForArtist(List<string> languages)
+        {
+            CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.NeutralCultures);
+
+            return languages
+                .Distinct()
+                .Map(
+                    lang => allCultures.Filter(
+                        ci => string.Equals(ci.ThreeLetterISOLanguageName, lang, StringComparison.OrdinalIgnoreCase)))
+                .Sequence()
+                .Flatten()
+                .ToList();
+        }
     }
 }

ErsatzTV.Application/Artists/Queries/GetArtistByIdHandler.cs

@@ -1,5 +1,7 @@
-using System.Threading;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
 using LanguageExt;
 using MediatR;
@@ -10,12 +12,26 @@ namespace ErsatzTV.Application.Artists.Queries
     public class GetArtistByIdHandler : IRequestHandler<GetArtistById, Option<ArtistViewModel>>
     {
         private readonly IArtistRepository _artistRepository;
+        private readonly ISearchRepository _searchRepository;
 
-        public GetArtistByIdHandler(IArtistRepository artistRepository) => _artistRepository = artistRepository;
+        public GetArtistByIdHandler(IArtistRepository artistRepository, ISearchRepository searchRepository)
+        {
+            _artistRepository = artistRepository;
+            _searchRepository = searchRepository;
+        }
 
-        public Task<Option<ArtistViewModel>> Handle(
+        public async Task<Option<ArtistViewModel>> Handle(
             GetArtistById request,
-            CancellationToken cancellationToken) =>
-            _artistRepository.GetArtist(request.ArtistId).MapT(ProjectToViewModel);
+            CancellationToken cancellationToken)
+        {
+            Option<Artist> maybeArtist = await _artistRepository.GetArtist(request.ArtistId);
+            return await maybeArtist.Match<Task<Option<ArtistViewModel>>>(
+                async artist =>
+                {
+                    List<string> languages = await _searchRepository.GetLanguagesForArtist(artist);
+                    return ProjectToViewModel(artist, languages);
+                },
+                () => Task.FromResult(Option<ArtistViewModel>.None));
+        }
     }
 }

ErsatzTV.Application/Configuration/Commands/SaveConfigElementByKey.cs

@@ -0,0 +1,7 @@
+using ErsatzTV.Core.Domain;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Configuration.Commands
+{
+    public record SaveConfigElementByKey(ConfigElementKey Key, string Value) : MediatR.IRequest<Unit>;
+}

ErsatzTV.Application/Configuration/Commands/SaveConfigElementByKeyHandler.cs

@@ -0,0 +1,34 @@
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Configuration.Commands
+{
+    public class SaveConfigElementByKeyHandler : MediatR.IRequestHandler<SaveConfigElementByKey, Unit>
+    {
+        private readonly IConfigElementRepository _configElementRepository;
+
+        public SaveConfigElementByKeyHandler(IConfigElementRepository configElementRepository) =>
+            _configElementRepository = configElementRepository;
+
+        public async Task<Unit> Handle(SaveConfigElementByKey request, CancellationToken cancellationToken)
+        {
+            Option<ConfigElement> maybeElement = await _configElementRepository.Get(request.Key);
+            await maybeElement.Match(
+                ce =>
+                {
+                    ce.Value = request.Value;
+                    return _configElementRepository.Update(ce);
+                },
+                () =>
+                {
+                    var ce = new ConfigElement { Key = request.Key.Key, Value = request.Value };
+                    return _configElementRepository.Add(ce);
+                });
+
+            return Unit.Default;
+        }
+    }
+}

ErsatzTV.Application/Configuration/ConfigElementViewModel.cs

@@ -0,0 +1,4 @@
+namespace ErsatzTV.Application.Configuration
+{
+    public record ConfigElementViewModel(string Key, string Value);
+}

ErsatzTV.Application/Configuration/Mapper.cs

@@ -0,0 +1,10 @@
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.Configuration
+{
+    internal static class Mapper
+    {
+        internal static ConfigElementViewModel ProjectToViewModel(ConfigElement element) =>
+            new(element.Key, element.Value);
+    }
+}

ErsatzTV.Application/Configuration/Queries/GetConfigElementByKey.cs

@@ -0,0 +1,8 @@
+using ErsatzTV.Core.Domain;
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Configuration.Queries
+{
+    public record GetConfigElementByKey(ConfigElementKey Key) : IRequest<Option<ConfigElementViewModel>>;
+}

ErsatzTV.Application/Configuration/Queries/GetConfigElementByKeyHandler.cs

@@ -0,0 +1,22 @@
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+using static ErsatzTV.Application.Configuration.Mapper;
+
+namespace ErsatzTV.Application.Configuration.Queries
+{
+    public class GetConfigElementByKeyHandler : IRequestHandler<GetConfigElementByKey, Option<ConfigElementViewModel>>
+    {
+        private readonly IConfigElementRepository _configElementRepository;
+
+        public GetConfigElementByKeyHandler(IConfigElementRepository configElementRepository) =>
+            _configElementRepository = configElementRepository;
+
+        public Task<Option<ConfigElementViewModel>> Handle(
+            GetConfigElementByKey request,
+            CancellationToken cancellationToken) =>
+            _configElementRepository.Get(request.Key).MapT(ProjectToViewModel);
+    }
+}

ErsatzTV.Application/FFmpegProfiles/Commands/UpdateFFmpegSettingsHandler.cs

@@ -86,8 +86,10 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
             return Unit.Default;
         }
 
-        private Task Upsert(ConfigElementKey key, string value) =>
-            _configElementRepository.Get(key).Match(
+        private async Task Upsert(ConfigElementKey key, string value)
+        {
+            Option<ConfigElement> maybeElement = await _configElementRepository.Get(key);
+            await maybeElement.Match(
                 ce =>
                 {
                     ce.Value = value;
@@ -98,5 +100,6 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
                     var ce = new ConfigElement { Key = key.Key, Value = value };
                     return _configElementRepository.Add(ce);
                 });
+        }
     }
 }

ErsatzTV.Application/MediaCards/ActorCardViewModel.cs

@@ -0,0 +1,5 @@
+namespace ErsatzTV.Application.MediaCards
+{
+    public record ActorCardViewModel(int Id, string Name, string Role, string Thumb) :
+        MediaCardViewModel(Id, Name, Role, Name, Thumb);
+}

ErsatzTV.Application/MediaCards/ArtistCardViewModel.cs

@@ -6,7 +6,5 @@
             Title,
             Subtitle,
             SortTitle,
-            Poster)
-    {
-    }
+            Poster);
 }

ErsatzTV.Application/MediaCards/Mapper.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using ErsatzTV.Core.Domain;
 using static LanguageExt.Prelude;
@@ -82,20 +81,18 @@ namespace ErsatzTV.Application.MediaCards
                 collection.MediaItems.OfType<Season>().Map(ProjectToViewModel).ToList(),
                 collection.MediaItems.OfType<Episode>().Map(e => ProjectToViewModel(e.EpisodeMetadata.Head()))
                     .ToList(),
-                collection.MediaItems.OfType<Artist>().Map(a  => ProjectToViewModel(a.ArtistMetadata.Head())).ToList(),
+                collection.MediaItems.OfType<Artist>().Map(a => ProjectToViewModel(a.ArtistMetadata.Head())).ToList(),
                 collection.MediaItems.OfType<MusicVideo>().Map(mv => ProjectToViewModel(mv.MusicVideoMetadata.Head()))
                     .ToList()) { UseCustomPlaybackOrder = collection.UseCustomPlaybackOrder };
 
+        internal static ActorCardViewModel ProjectToViewModel(Actor actor) =>
+            new(actor.Id, actor.Name, actor.Role, actor.Artwork?.Path);
+
         private static int GetCustomIndex(Collection collection, int mediaItemId) =>
             Optional(collection.CollectionItems.Find(ci => ci.MediaItemId == mediaItemId))
                 .Map(ci => ci.CustomIndex ?? 0)
                 .IfNone(0);
 
-        internal static SearchCardResultsViewModel ProjectToSearchResults(List<MediaItem> items) =>
-            new(
-                items.OfType<Movie>().Map(m => ProjectToViewModel(m.MovieMetadata.Head())).ToList(),
-                items.OfType<Show>().Map(s => ProjectToViewModel(s.ShowMetadata.Head())).ToList());
-
         private static string GetSeasonName(int number) =>
             number == 0 ? "Specials" : $"Season {number}";
 

ErsatzTV.Application/MediaCards/MusicVideoCardViewModel.cs

@@ -1,12 +1,18 @@
 namespace ErsatzTV.Application.MediaCards
 {
     public record MusicVideoCardViewModel
-        (int MusicVideoId, string Title, string Subtitle, string SortTitle, string Plot, string Poster) : MediaCardViewModel(
-            MusicVideoId,
-            Title,
-            Subtitle,
-            SortTitle,
-            Poster)
+    (
+        int MusicVideoId,
+        string Title,
+        string Subtitle,
+        string SortTitle,
+        string Plot,
+        string Poster) : MediaCardViewModel(
+        MusicVideoId,
+        Title,
+        Subtitle,
+        SortTitle,
+        Poster)
     {
         public int CustomIndex { get; set; }
     }

ErsatzTV.Application/MediaCollections/Commands/AddArtistToCollectionHandler.cs

@@ -12,9 +12,9 @@ namespace ErsatzTV.Application.MediaCollections.Commands
     public class
         AddArtistToCollectionHandler : MediatR.IRequestHandler<AddArtistToCollection, Either<BaseError, Unit>>
     {
+        private readonly IArtistRepository _artistRepository;
         private readonly ChannelWriter<IBackgroundServiceRequest> _channel;
         private readonly IMediaCollectionRepository _mediaCollectionRepository;
-        private readonly IArtistRepository _artistRepository;
 
         public AddArtistToCollectionHandler(
             IMediaCollectionRepository mediaCollectionRepository,

ErsatzTV.Application/MediaItems/Queries/GetAllLanguageCodesHandler.cs

@@ -20,7 +20,7 @@ namespace ErsatzTV.Application.MediaItems.Queries
         {
             var result = new List<CultureInfo>();
 
-            CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
+            CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.NeutralCultures);
             List<string> allLanguageCodes = await _mediaItemRepository.GetAllLanguageCodes();
             foreach (string code in allLanguageCodes)
             {

ErsatzTV.Application/Movies/Mapper.cs

@@ -1,5 +1,9 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using ErsatzTV.Core.Domain;
+using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace ErsatzTV.Application.Movies
@@ -17,7 +21,26 @@ namespace ErsatzTV.Application.Movies
                 Artwork(metadata, ArtworkKind.FanArt),
                 metadata.Genres.Map(g => g.Name).ToList(),
                 metadata.Tags.Map(t => t.Name).ToList(),
-                metadata.Studios.Map(s => s.Name).ToList());
+                metadata.Studios.Map(s => s.Name).ToList(),
+                LanguagesForMovie(movie),
+                metadata.Actors.OrderBy(a => a.Order).ThenBy(a => a.Id).Map(MediaCards.Mapper.ProjectToViewModel)
+                    .ToList());
+        }
+
+        private static List<CultureInfo> LanguagesForMovie(Movie movie)
+        {
+            CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.NeutralCultures);
+
+            return movie.MediaVersions
+                .Map(mv => mv.Streams.Filter(s => s.MediaStreamKind == MediaStreamKind.Audio).Map(s => s.Language))
+                .Flatten()
+                .Distinct()
+                .Map(
+                    lang => allCultures.Filter(
+                        ci => string.Equals(ci.ThreeLetterISOLanguageName, lang, StringComparison.OrdinalIgnoreCase)))
+                .Sequence()
+                .Flatten()
+                .ToList();
         }
 
         private static string Artwork(Metadata metadata, ArtworkKind artworkKind) =>

ErsatzTV.Application/Movies/MovieViewModel.cs

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Globalization;
+using ErsatzTV.Application.MediaCards;
 
 namespace ErsatzTV.Application.Movies
 {
@@ -10,5 +12,7 @@ namespace ErsatzTV.Application.Movies
         string FanArt,
         List<string> Genres,
         List<string> Tags,
-        List<string> Studios);
+        List<string> Studios,
+        List<CultureInfo> Languages,
+        List<ActorCardViewModel> Actors);
 }

ErsatzTV.Application/Playouts/Commands/CreatePlayoutHandler.cs

@@ -48,7 +48,7 @@ namespace ErsatzTV.Application.Playouts.Commands
         }
 
         private async Task<Validation<BaseError, Playout>> Validate(CreatePlayout request) =>
-            (await ChannelMustExist(request), await ProgramScheduleMustExist(request), ValidatePlayoutType(request))
+            (await ValidateChannel(request), await ProgramScheduleMustExist(request), ValidatePlayoutType(request))
             .Apply(
                 (channel, programSchedule, playoutType) => new Playout
                 {
@@ -57,10 +57,19 @@ namespace ErsatzTV.Application.Playouts.Commands
                     ProgramSchedulePlayoutType = playoutType
                 });
 
+        private Task<Validation<BaseError, Channel>> ValidateChannel(CreatePlayout createPlayout) =>
+            ChannelMustExist(createPlayout).BindT(ChannelMustNotHavePlayouts);
+
         private async Task<Validation<BaseError, Channel>> ChannelMustExist(CreatePlayout createPlayout) =>
             (await _channelRepository.Get(createPlayout.ChannelId))
             .ToValidation<BaseError>("Channel does not exist.");
 
+        private async Task<Validation<BaseError, Channel>> ChannelMustNotHavePlayouts(Channel channel) =>
+            Optional(await _channelRepository.CountPlayouts(channel.Id))
+                .Filter(count => count == 0)
+                .Map(_ => channel)
+                .ToValidation<BaseError>("Channel already has one playout.");
+
         private async Task<Validation<BaseError, ProgramSchedule>> ProgramScheduleMustExist(
             CreatePlayout createPlayout) =>
             (await _programScheduleRepository.GetWithPlayouts(createPlayout.ProgramScheduleId))

ErsatzTV.Application/Search/SearchResultAllItemsViewModel.cs

@@ -2,5 +2,9 @@
 
 namespace ErsatzTV.Application.Search
 {
-    public record SearchResultAllItemsViewModel(List<int> MovieIds, List<int> ShowIds, List<int> ArtistIds, List<int> MusicVideoIds);
+    public record SearchResultAllItemsViewModel(
+        List<int> MovieIds,
+        List<int> ShowIds,
+        List<int> ArtistIds,
+        List<int> MusicVideoIds);
 }

ErsatzTV.Application/Television/Mapper.cs

@@ -1,13 +1,17 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using ErsatzTV.Application.MediaCards;
 using ErsatzTV.Core.Domain;
+using LanguageExt;
 using static LanguageExt.Prelude;
 
 namespace ErsatzTV.Application.Television
 {
     internal static class Mapper
     {
-        internal static TelevisionShowViewModel ProjectToViewModel(Show show) =>
+        internal static TelevisionShowViewModel ProjectToViewModel(Show show, List<string> languages) =>
             new(
                 show.Id,
                 show.ShowMetadata.HeadOrNone().Map(m => m.Title ?? string.Empty).IfNone(string.Empty),
@@ -18,7 +22,13 @@ namespace ErsatzTV.Application.Television
                 show.ShowMetadata.HeadOrNone().Map(m => m.Genres.Map(g => g.Name).ToList()).IfNone(new List<string>()),
                 show.ShowMetadata.HeadOrNone().Map(m => m.Tags.Map(g => g.Name).ToList()).IfNone(new List<string>()),
                 show.ShowMetadata.HeadOrNone().Map(m => m.Studios.Map(s => s.Name).ToList())
-                    .IfNone(new List<string>()));
+                    .IfNone(new List<string>()),
+                LanguagesForShow(languages),
+                show.ShowMetadata.HeadOrNone()
+                    .Map(
+                        m => m.Actors.OrderBy(a => a.Order).ThenBy(a => a.Id).Map(MediaCards.Mapper.ProjectToViewModel)
+                            .ToList())
+                    .IfNone(new List<ActorCardViewModel>()));
 
         internal static TelevisionSeasonViewModel ProjectToViewModel(Season season) =>
             new(
@@ -48,5 +58,19 @@ namespace ErsatzTV.Application.Television
         private static string GetArtwork(Metadata metadata, ArtworkKind artworkKind) =>
             Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == artworkKind))
                 .Match(a => a.Path, string.Empty);
+
+        private static List<CultureInfo> LanguagesForShow(List<string> languages)
+        {
+            CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.NeutralCultures);
+
+            return languages
+                .Distinct()
+                .Map(
+                    lang => allCultures.Filter(
+                        ci => string.Equals(ci.ThreeLetterISOLanguageName, lang, StringComparison.OrdinalIgnoreCase)))
+                .Sequence()
+                .Flatten()
+                .ToList();
+        }
     }
 }

ErsatzTV.Application/Television/Queries/GetTelevisionShowByIdHandler.cs

@@ -1,5 +1,7 @@
-using System.Threading;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
 using LanguageExt;
 using MediatR;
@@ -9,15 +11,29 @@ namespace ErsatzTV.Application.Television.Queries
 {
     public class GetTelevisionShowByIdHandler : IRequestHandler<GetTelevisionShowById, Option<TelevisionShowViewModel>>
     {
+        private readonly ISearchRepository _searchRepository;
         private readonly ITelevisionRepository _televisionRepository;
 
-        public GetTelevisionShowByIdHandler(ITelevisionRepository televisionRepository) =>
+        public GetTelevisionShowByIdHandler(
+            ITelevisionRepository televisionRepository,
+            ISearchRepository searchRepository)
+        {
             _televisionRepository = televisionRepository;
+            _searchRepository = searchRepository;
+        }
 
-        public Task<Option<TelevisionShowViewModel>> Handle(
+        public async Task<Option<TelevisionShowViewModel>> Handle(
             GetTelevisionShowById request,
-            CancellationToken cancellationToken) =>
-            _televisionRepository.GetShow(request.Id)
-                .MapT(ProjectToViewModel);
+            CancellationToken cancellationToken)
+        {
+            Option<Show> maybeShow = await _televisionRepository.GetShow(request.Id);
+            return await maybeShow.Match<Task<Option<TelevisionShowViewModel>>>(
+                async show =>
+                {
+                    List<string> languages = await _searchRepository.GetLanguagesForShow(show);
+                    return ProjectToViewModel(show, languages);
+                },
+                () => Task.FromResult(Option<TelevisionShowViewModel>.None));
+        }
     }
 }

ErsatzTV.Application/Television/TelevisionShowViewModel.cs

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Globalization;
+using ErsatzTV.Application.MediaCards;
 
 namespace ErsatzTV.Application.Television
 {
@@ -11,5 +13,7 @@ namespace ErsatzTV.Application.Television
         string FanArt,
         List<string> Genres,
         List<string> Tags,
-        List<string> Studios);
+        List<string> Studios,
+        List<CultureInfo> Languages,
+        List<ActorCardViewModel> Actors);
 }

ErsatzTV.Core.Tests/Fakes/FakeTelevisionRepository.cs

@@ -79,6 +79,9 @@ namespace ErsatzTV.Core.Tests.Fakes
         public Task<bool> AddTag(ShowMetadata metadata, Tag tag) => throw new NotSupportedException();
 
         public Task<bool> AddStudio(ShowMetadata metadata, Studio studio) => throw new NotSupportedException();
+        public Task<bool> AddActor(ShowMetadata metadata, Actor actor) => throw new NotSupportedException();
+
+        public Task<bool> AddActor(EpisodeMetadata metadata, Actor actor) => throw new NotSupportedException();
 
         public Task<List<int>> RemoveMissingPlexShows(PlexLibrary library, List<string> showKeys) =>
             throw new NotSupportedException();

ErsatzTV.Core/Domain/ConfigElementKey.cs

@@ -14,5 +14,6 @@
         public static ConfigElementKey FFmpegPreferredLanguageCode => new("ffmpeg.preferred_language_code");
         public static ConfigElementKey SearchIndexVersion => new("search_index.version");
         public static ConfigElementKey HDHRTunerCount => new("hdhr.tuner_count");
+        public static ConfigElementKey CollectionsPageSize => new("pages.collections.page_size");
     }
 }

ErsatzTV.Core/Domain/Metadata/Actor.cs

@@ -0,0 +1,12 @@
+namespace ErsatzTV.Core.Domain
+{
+    public class Actor
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Role { get; set; }
+        public int? Order { get; set; }
+        public int? ArtworkId { get; set; }
+        public Artwork Artwork { get; set; }
+    }
+}

ErsatzTV.Core/Domain/Metadata/Metadata.cs

@@ -18,5 +18,6 @@ namespace ErsatzTV.Core.Domain
         public List<Genre> Genres { get; set; }
         public List<Tag> Tags { get; set; }
         public List<Studio> Studios { get; set; }
+        public List<Actor> Actors { get; set; }
     }
 }

ErsatzTV.Core/FFmpeg/DisplaySizeExtensions.cs

@@ -4,9 +4,6 @@ namespace ErsatzTV.Core.FFmpeg
 {
     public static class DisplaySizeExtensions
     {
-        internal static IDisplaySize PadToEven(this IDisplaySize size) =>
-            new DisplaySize(size.Width + size.Width % 2, size.Height + size.Height % 2);
-
         internal static bool IsSameSizeAs(this IDisplaySize @this, IDisplaySize that) =>
             @this.Width == that.Width && @this.Height == that.Height;
     }

ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs

@@ -60,7 +60,6 @@ namespace ErsatzTV.Core.FFmpeg
                     builder = builder.WithDeinterlace(playbackSettings.Deinterlace)
                         .WithScaling(scaledSize);
 
-                    scaledSize = scaledSize.PadToEven();
                     if (NeedToPad(channel.FFmpegProfile.Resolution, scaledSize))
                     {
                         builder = builder.WithBlackBars(channel.FFmpegProfile.Resolution);

ErsatzTV.Core/Interfaces/GitHub/IGitHubApiClient.cs

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using LanguageExt;
+
+namespace ErsatzTV.Core.Interfaces.GitHub
+{
+    public interface IGitHubApiClient
+    {
+        Task<Either<BaseError, string>> GetLatestReleaseNotes();
+        Task<Either<BaseError, string>> GetReleaseNotes(string tag);
+    }
+}

ErsatzTV.Core/Interfaces/Plex/IPlexMovieLibraryScanner.cs

@@ -10,6 +10,6 @@ namespace ErsatzTV.Core.Interfaces.Plex
         Task<Either<BaseError, Unit>> ScanLibrary(
             PlexConnection connection,
             PlexServerAuthToken token,
-            PlexLibrary plexMediaSourceLibrary);
+            PlexLibrary library);
     }
 }

ErsatzTV.Core/Interfaces/Plex/IPlexServerApiClient.cs

@@ -34,6 +34,18 @@ namespace ErsatzTV.Core.Interfaces.Plex
             PlexConnection connection,
             PlexServerAuthToken token);
 
+        Task<Either<BaseError, MovieMetadata>> GetMovieMetadata(
+            PlexLibrary library,
+            string key,
+            PlexConnection connection,
+            PlexServerAuthToken token);
+
+        Task<Either<BaseError, ShowMetadata>> GetShowMetadata(
+            PlexLibrary library,
+            string key,
+            PlexConnection connection,
+            PlexServerAuthToken token);
+
         Task<Either<BaseError, MediaVersion>> GetStatistics(
             string key,
             PlexConnection connection,

ErsatzTV.Core/Interfaces/Plex/IPlexTelevisionLibraryScanner.cs

@@ -10,6 +10,6 @@ namespace ErsatzTV.Core.Interfaces.Plex
         Task<Either<BaseError, Unit>> ScanLibrary(
             PlexConnection connection,
             PlexServerAuthToken token,
-            PlexLibrary plexMediaSourceLibrary);
+            PlexLibrary library);
     }
 }

ErsatzTV.Core/Interfaces/Repositories/IChannelRepository.cs

@@ -14,5 +14,6 @@ namespace ErsatzTV.Core.Interfaces.Repositories
         Task<List<Channel>> GetAllForGuide();
         Task Update(Channel channel);
         Task Delete(int channelId);
+        Task<int> CountPlayouts(int channelId);
     }
 }

ErsatzTV.Core/Interfaces/Repositories/IMetadataRepository.cs

@@ -12,6 +12,7 @@ namespace ErsatzTV.Core.Interfaces.Repositories
         Task<bool> RemoveStudio(Studio studio);
         Task<bool> RemoveStyle(Style style);
         Task<bool> RemoveMood(Mood mood);
+        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);
@@ -22,5 +23,6 @@ namespace ErsatzTV.Core.Interfaces.Repositories
         Task<Unit> MarkAsUpdated(ShowMetadata metadata, DateTime dateUpdated);
         Task<Unit> MarkAsUpdated(SeasonMetadata metadata, DateTime dateUpdated);
         Task<Unit> MarkAsUpdated(MovieMetadata metadata, DateTime dateUpdated);
+        Task<Unit> MarkAsUpdated(EpisodeMetadata metadata, DateTime dateUpdated);
     }
 }

ErsatzTV.Core/Interfaces/Repositories/IMovieRepository.cs

@@ -20,6 +20,7 @@ namespace ErsatzTV.Core.Interfaces.Repositories
         Task<bool> AddGenre(MovieMetadata metadata, Genre genre);
         Task<bool> AddTag(MovieMetadata metadata, Tag tag);
         Task<bool> AddStudio(MovieMetadata metadata, Studio studio);
+        Task<bool> AddActor(MovieMetadata metadata, Actor actor);
         Task<List<int>> RemoveMissingPlexMovies(PlexLibrary library, List<string> movieKeys);
         Task<bool> UpdateSortTitle(MovieMetadata movieMetadata);
     }

ErsatzTV.Core/Interfaces/Repositories/ITelevisionRepository.cs

@@ -42,6 +42,8 @@ namespace ErsatzTV.Core.Interfaces.Repositories
         Task<bool> AddGenre(ShowMetadata metadata, Genre genre);
         Task<bool> AddTag(ShowMetadata metadata, Tag tag);
         Task<bool> AddStudio(ShowMetadata metadata, Studio studio);
+        Task<bool> AddActor(ShowMetadata metadata, Actor actor);
+        Task<bool> AddActor(EpisodeMetadata metadata, Actor actor);
         Task<List<int>> RemoveMissingPlexShows(PlexLibrary library, List<string> showKeys);
         Task<Unit> RemoveMissingPlexSeasons(string showKey, List<string> seasonKeys);
         Task<Unit> RemoveMissingPlexEpisodes(string seasonKey, List<string> episodeKeys);

ErsatzTV.Core/Iptv/ChannelGuide.cs

@@ -239,6 +239,9 @@ namespace ErsatzTV.Core.Iptv
                 Episode e => e.EpisodeMetadata.HeadOrNone().Match(
                     em => em.Title ?? string.Empty,
                     () => string.Empty),
+                MusicVideo mv => mv.MusicVideoMetadata.HeadOrNone().Match(
+                    mvm => mvm.Title ?? string.Empty,
+                    () => string.Empty),
                 _ => string.Empty
             };
         }

ErsatzTV.Core/Metadata/FallbackMetadataProvider.cs

@@ -97,6 +97,7 @@ namespace ErsatzTV.Core.Metadata
                 {
                     metadata.Title = match.Groups[1].Value;
                     metadata.DateUpdated = DateTime.UtcNow;
+                    metadata.Actors = new List<Actor>();
                     return Tuple(metadata, int.Parse(match.Groups[3].Value));
                 }
             }
@@ -122,6 +123,7 @@ namespace ErsatzTV.Core.Metadata
                     metadata.Genres = new List<Genre>();
                     metadata.Tags = new List<Tag>();
                     metadata.Studios = new List<Studio>();
+                    metadata.Actors = new List<Actor>();
                     metadata.DateUpdated = DateTime.UtcNow;
                 }
             }
@@ -166,6 +168,10 @@ namespace ErsatzTV.Core.Metadata
                     metadata.Title = match.Groups[1].Value;
                     metadata.Year = int.Parse(match.Groups[2].Value);
                     metadata.ReleaseDate = new DateTime(int.Parse(match.Groups[2].Value), 1, 1);
+                    metadata.Genres = new List<Genre>();
+                    metadata.Tags = new List<Tag>();
+                    metadata.Studios = new List<Studio>();
+                    metadata.Actors = new List<Actor>();
                     metadata.DateUpdated = DateTime.UtcNow;
                 }
             }

ErsatzTV.Core/Metadata/LocalMetadataProvider.cs

@@ -183,7 +183,7 @@ namespace ErsatzTV.Core.Metadata
             }
 
             await Optional(episode.EpisodeMetadata).Flatten().HeadOrNone().Match(
-                existing =>
+                async existing =>
                 {
                     existing.Outline = metadata.Outline;
                     existing.Plot = metadata.Plot;
@@ -204,9 +204,17 @@ namespace ErsatzTV.Core.Metadata
                         ? _fallbackMetadataProvider.GetSortTitle(metadata.Title)
                         : metadata.SortTitle;
 
-                    return _metadataRepository.Update(existing);
+                    bool updated = await UpdateMetadataCollections(
+                        existing,
+                        metadata,
+                        (_, _) => Task.FromResult(false),
+                        (_, _) => Task.FromResult(false),
+                        (_, _) => Task.FromResult(false),
+                        _televisionRepository.AddActor);
+
+                    return await _metadataRepository.Update(existing) || updated;
                 },
-                () =>
+                async () =>
                 {
                     metadata.SortTitle = string.IsNullOrWhiteSpace(metadata.SortTitle)
                         ? _fallbackMetadataProvider.GetSortTitle(metadata.Title)
@@ -214,7 +222,7 @@ namespace ErsatzTV.Core.Metadata
                     metadata.EpisodeId = episode.Id;
                     episode.EpisodeMetadata = new List<EpisodeMetadata> { metadata };
 
-                    return _metadataRepository.Add(metadata);
+                    return await _metadataRepository.Add(metadata);
                 });
 
             return true;
@@ -248,7 +256,8 @@ namespace ErsatzTV.Core.Metadata
                         metadata,
                         _movieRepository.AddGenre,
                         _movieRepository.AddTag,
-                        _movieRepository.AddStudio);
+                        _movieRepository.AddStudio,
+                        _movieRepository.AddActor);
 
                     return await _metadataRepository.Update(existing) || updated;
                 },
@@ -291,7 +300,8 @@ namespace ErsatzTV.Core.Metadata
                         metadata,
                         _televisionRepository.AddGenre,
                         _televisionRepository.AddTag,
-                        _televisionRepository.AddStudio);
+                        _televisionRepository.AddStudio,
+                        _televisionRepository.AddActor);
 
                     return await _metadataRepository.Update(existing) || updated;
                 },
@@ -427,7 +437,8 @@ namespace ErsatzTV.Core.Metadata
                         metadata,
                         _musicVideoRepository.AddGenre,
                         _musicVideoRepository.AddTag,
-                        _musicVideoRepository.AddStudio);
+                        _musicVideoRepository.AddStudio,
+                        (_, _) => Task.FromResult(false));
 
                     return await _metadataRepository.Update(existing) || updated;
                 },
@@ -449,20 +460,27 @@ namespace ErsatzTV.Core.Metadata
                 await using FileStream fileStream = File.Open(nfoFileName, FileMode.Open, FileAccess.Read);
                 Option<TvShowNfo> maybeNfo = TvShowSerializer.Deserialize(fileStream) as TvShowNfo;
                 return maybeNfo.Match<Option<ShowMetadata>>(
-                    nfo => new ShowMetadata
+                    nfo =>
                     {
-                        MetadataKind = MetadataKind.Sidecar,
-                        DateAdded = DateTime.UtcNow,
-                        DateUpdated = File.GetLastWriteTimeUtc(nfoFileName),
-                        Title = nfo.Title,
-                        Plot = nfo.Plot,
-                        Outline = nfo.Outline,
-                        Tagline = nfo.Tagline,
-                        Year = GetYear(nfo.Year, nfo.Premiered),
-                        ReleaseDate = GetAired(nfo.Year, nfo.Premiered),
-                        Genres = nfo.Genres.Map(g => new Genre { Name = g }).ToList(),
-                        Tags = nfo.Tags.Map(t => new Tag { Name = t }).ToList(),
-                        Studios = nfo.Studios.Map(s => new Studio { Name = s }).ToList()
+                        DateTime dateAdded = DateTime.UtcNow;
+                        DateTime dateUpdated = File.GetLastWriteTimeUtc(nfoFileName);
+
+                        return new ShowMetadata
+                        {
+                            MetadataKind = MetadataKind.Sidecar,
+                            DateAdded = dateAdded,
+                            DateUpdated = dateUpdated,
+                            Title = nfo.Title,
+                            Plot = nfo.Plot,
+                            Outline = nfo.Outline,
+                            Tagline = nfo.Tagline,
+                            Year = GetYear(nfo.Year, nfo.Premiered),
+                            ReleaseDate = GetAired(nfo.Year, nfo.Premiered),
+                            Genres = nfo.Genres.Map(g => new Genre { Name = g }).ToList(),
+                            Tags = nfo.Tags.Map(t => new Tag { Name = t }).ToList(),
+                            Studios = nfo.Studios.Map(s => new Studio { Name = s }).ToList(),
+                            Actors = Actors(nfo.Actors, dateAdded, dateUpdated)
+                        };
                     },
                     None);
             }
@@ -510,14 +528,18 @@ namespace ErsatzTV.Core.Metadata
                 return maybeNfo.Match<Option<Tuple<EpisodeMetadata, int>>>(
                     nfo =>
                     {
+                        DateTime dateAdded = DateTime.UtcNow;
+                        DateTime dateUpdated = File.GetLastWriteTimeUtc(nfoFileName);
+
                         var metadata = new EpisodeMetadata
                         {
                             MetadataKind = MetadataKind.Sidecar,
-                            DateAdded = DateTime.UtcNow,
-                            DateUpdated = File.GetLastWriteTimeUtc(nfoFileName),
+                            DateAdded = dateAdded,
+                            DateUpdated = dateUpdated,
                             Title = nfo.Title,
                             ReleaseDate = GetAired(0, nfo.Aired),
-                            Plot = nfo.Plot
+                            Plot = nfo.Plot,
+                            Actors = Actors(nfo.Actors, dateAdded, dateUpdated)
                         };
                         return Tuple(metadata, nfo.Episode);
                     },
@@ -537,20 +559,27 @@ namespace ErsatzTV.Core.Metadata
                 await using FileStream fileStream = File.Open(nfoFileName, FileMode.Open, FileAccess.Read);
                 Option<MovieNfo> maybeNfo = MovieSerializer.Deserialize(fileStream) as MovieNfo;
                 return maybeNfo.Match<Option<MovieMetadata>>(
-                    nfo => new MovieMetadata
+                    nfo =>
                     {
-                        MetadataKind = MetadataKind.Sidecar,
-                        DateAdded = DateTime.UtcNow,
-                        DateUpdated = File.GetLastWriteTimeUtc(nfoFileName),
-                        Title = nfo.Title,
-                        Year = nfo.Year,
-                        ReleaseDate = nfo.Premiered,
-                        Plot = nfo.Plot,
-                        Outline = nfo.Outline,
-                        Tagline = nfo.Tagline,
-                        Genres = nfo.Genres.Map(g => new Genre { Name = g }).ToList(),
-                        Tags = nfo.Tags.Map(t => new Tag { Name = t }).ToList(),
-                        Studios = nfo.Studios.Map(s => new Studio { Name = s }).ToList()
+                        DateTime dateAdded = DateTime.UtcNow;
+                        DateTime dateUpdated = File.GetLastWriteTimeUtc(nfoFileName);
+
+                        return new MovieMetadata
+                        {
+                            MetadataKind = MetadataKind.Sidecar,
+                            DateAdded = dateAdded,
+                            DateUpdated = dateUpdated,
+                            Title = nfo.Title,
+                            Year = nfo.Year,
+                            ReleaseDate = nfo.Premiered,
+                            Plot = nfo.Plot,
+                            Outline = nfo.Outline,
+                            Tagline = nfo.Tagline,
+                            Genres = nfo.Genres.Map(g => new Genre { Name = g }).ToList(),
+                            Tags = nfo.Tags.Map(t => new Tag { Name = t }).ToList(),
+                            Studios = nfo.Studios.Map(s => new Studio { Name = s }).ToList(),
+                            Actors = Actors(nfo.Actors, dateAdded, dateUpdated)
+                        };
                     },
                     None);
             }
@@ -598,74 +627,135 @@ namespace ErsatzTV.Core.Metadata
             T incoming,
             Func<T, Genre, Task<bool>> addGenre,
             Func<T, Tag, Task<bool>> addTag,
-            Func<T, Studio, Task<bool>> addStudio)
+            Func<T, Studio, Task<bool>> addStudio,
+            Func<T, Actor, Task<bool>> addActor)
             where T : Domain.Metadata
         {
             var updated = false;
 
-            foreach (Genre genre in existing.Genres.Filter(g => incoming.Genres.All(g2 => g2.Name != g.Name))
-                .ToList())
+            if (existing is not EpisodeMetadata)
             {
-                existing.Genres.Remove(genre);
-                if (await _metadataRepository.RemoveGenre(genre))
+                foreach (Genre genre in existing.Genres.Filter(g => incoming.Genres.All(g2 => g2.Name != g.Name))
+                    .ToList())
                 {
-                    updated = true;
+                    existing.Genres.Remove(genre);
+                    if (await _metadataRepository.RemoveGenre(genre))
+                    {
+                        updated = true;
+                    }
+                }
+
+                foreach (Genre genre in incoming.Genres.Filter(g => existing.Genres.All(g2 => g2.Name != g.Name))
+                    .ToList())
+                {
+                    existing.Genres.Add(genre);
+                    if (await addGenre(existing, genre))
+                    {
+                        updated = true;
+                    }
+                }
+
+                foreach (Tag tag in existing.Tags.Filter(t => incoming.Tags.All(t2 => t2.Name != t.Name))
+                    .ToList())
+                {
+                    existing.Tags.Remove(tag);
+                    if (await _metadataRepository.RemoveTag(tag))
+                    {
+                        updated = true;
+                    }
+                }
+
+                foreach (Tag tag in incoming.Tags.Filter(t => existing.Tags.All(t2 => t2.Name != t.Name))
+                    .ToList())
+                {
+                    existing.Tags.Add(tag);
+                    if (await addTag(existing, tag))
+                    {
+                        updated = true;
+                    }
+                }
+
+                foreach (Studio studio in existing.Studios
+                    .Filter(s => incoming.Studios.All(s2 => s2.Name != s.Name))
+                    .ToList())
+                {
+                    existing.Studios.Remove(studio);
+                    if (await _metadataRepository.RemoveStudio(studio))
+                    {
+                        updated = true;
+                    }
+                }
+
+                foreach (Studio studio in incoming.Studios
+                    .Filter(s => existing.Studios.All(s2 => s2.Name != s.Name))
+                    .ToList())
+                {
+                    existing.Studios.Add(studio);
+                    if (await addStudio(existing, studio))
+                    {
+                        updated = true;
+                    }
                 }
             }
 
-            foreach (Genre genre in incoming.Genres.Filter(g => existing.Genres.All(g2 => g2.Name != g.Name))
-                .ToList())
+            if (existing is not MusicVideoMetadata)
             {
-                existing.Genres.Add(genre);
-                if (await addGenre(existing, genre))
+                foreach (Actor actor in existing.Actors
+                    .Filter(a => incoming.Actors.All(a2 => a2.Name != a.Name))
+                    .ToList())
                 {
-                    updated = true;
+                    existing.Actors.Remove(actor);
+                    if (await _metadataRepository.RemoveActor(actor))
+                    {
+                        updated = true;
+                    }
                 }
-            }
 
-            foreach (Tag tag in existing.Tags.Filter(t => incoming.Tags.All(t2 => t2.Name != t.Name))
-                .ToList())
-            {
-                existing.Tags.Remove(tag);
-                if (await _metadataRepository.RemoveTag(tag))
+                foreach (Actor actor in incoming.Actors
+                    .Filter(a => existing.Actors.All(a2 => a2.Name != a.Name))
+                    .ToList())
                 {
-                    updated = true;
-                }
-            }
-
-            foreach (Tag tag in incoming.Tags.Filter(t => existing.Tags.All(t2 => t2.Name != t.Name))
-                .ToList())
-            {
-                existing.Tags.Add(tag);
-                if (await addTag(existing, tag))
-                {
-                    updated = true;
-                }
-            }
-
-            foreach (Studio studio in existing.Studios
-                .Filter(s => incoming.Studios.All(s2 => s2.Name != s.Name))
-                .ToList())
-            {
-                existing.Studios.Remove(studio);
-                if (await _metadataRepository.RemoveStudio(studio))
-                {
-                    updated = true;
-                }
-            }
-
-            foreach (Studio studio in incoming.Studios
-                .Filter(s => existing.Studios.All(s2 => s2.Name != s.Name))
-                .ToList())
-            {
-                existing.Studios.Add(studio);
-                if (await addStudio(existing, studio))
-                {
-                    updated = true;
+                    existing.Actors.Add(actor);
+                    if (await addActor(existing, actor))
+                    {
+                        updated = true;
+                    }
                 }
             }
 
             return updated;
         }
+
+        private List<Actor> Actors(List<ActorNfo> actorNfos, DateTime dateAdded, DateTime dateUpdated)
+        {
+            var result = new List<Actor>();
+
+            for (var i = 0; i < actorNfos.Count; i++)
+            {
+                ActorNfo actorNfo = actorNfos[i];
+
+                var actor = new Actor
+                {
+                    Name = actorNfo.Name,
+                    Role = actorNfo.Role,
+                    Order = actorNfo.Order ?? i
+                };
+
+                if (!string.IsNullOrWhiteSpace(actorNfo.Thumb))
+                {
+                    actor.Artwork = new Artwork
+                    {
+                        Path = actorNfo.Thumb,
+                        ArtworkKind = ArtworkKind.Thumbnail,
+                        DateAdded = dateAdded,
+                        DateUpdated = dateUpdated
+                    };
+                }
+
+                result.Add(actor);
+            }
+
+            return result;
+        }
     }
 }

ErsatzTV.Core/Metadata/MovieFolderScanner.cs

@@ -98,7 +98,7 @@ namespace ErsatzTV.Core.Metadata
                     continue;
                 }
 
-                if (_localFileSystem.GetLastWriteTime(movieFolder) < lastScan)
+                if (allFiles.All(file => _localFileSystem.GetLastWriteTime(file) < lastScan))
                 {
                     continue;
                 }

ErsatzTV.Core/Metadata/Nfo/ActorNfo.cs

@@ -0,0 +1,19 @@
+using System.Xml.Serialization;
+
+namespace ErsatzTV.Core.Metadata.Nfo
+{
+    public class ActorNfo
+    {
+        [XmlElement("name")]
+        public string Name { get; set; }
+
+        [XmlElement("role")]
+        public string Role { get; set; }
+
+        [XmlElement("order")]
+        public int? Order { get; set; }
+
+        [XmlElement("thumb")]
+        public string Thumb { get; set; }
+    }
+}

ErsatzTV.Core/Metadata/Nfo/MovieNfo.cs

@@ -36,5 +36,8 @@ namespace ErsatzTV.Core.Metadata.Nfo
 
         [XmlElement("studio")]
         public List<string> Studios { get; set; }
+
+        [XmlElement("actor")]
+        public List<ActorNfo> Actors { get; set; }
     }
 }

ErsatzTV.Core/Metadata/Nfo/TvShowEpisodeNfo.cs

@@ -1,4 +1,5 @@
-using System.Xml.Serialization;
+using System.Collections.Generic;
+using System.Xml.Serialization;
 
 namespace ErsatzTV.Core.Metadata.Nfo
 {
@@ -25,5 +26,8 @@ namespace ErsatzTV.Core.Metadata.Nfo
 
         [XmlElement("plot")]
         public string Plot { get; set; }
+
+        [XmlElement("actor")]
+        public List<ActorNfo> Actors { get; set; }
     }
 }

ErsatzTV.Core/Metadata/Nfo/TvShowNfo.cs

@@ -32,5 +32,8 @@ namespace ErsatzTV.Core.Metadata.Nfo
 
         [XmlElement("studio")]
         public List<string> Studios { get; set; }
+
+        [XmlElement("actor")]
+        public List<ActorNfo> Actors { get; set; }
     }
 }

ErsatzTV.Core/Plex/PlexMovieLibraryScanner.cs

@@ -45,10 +45,10 @@ namespace ErsatzTV.Core.Plex
         public async Task<Either<BaseError, Unit>> ScanLibrary(
             PlexConnection connection,
             PlexServerAuthToken token,
-            PlexLibrary plexMediaSourceLibrary)
+            PlexLibrary library)
         {
             Either<BaseError, List<PlexMovie>> entries = await _plexServerApiClient.GetMovieLibraryContents(
-                plexMediaSourceLibrary,
+                library,
                 connection,
                 token);
 
@@ -58,13 +58,13 @@ namespace ErsatzTV.Core.Plex
                     foreach (PlexMovie incoming in movieEntries)
                     {
                         decimal percentCompletion = (decimal) movieEntries.IndexOf(incoming) / movieEntries.Count;
-                        await _mediator.Publish(new LibraryScanProgress(plexMediaSourceLibrary.Id, percentCompletion));
+                        await _mediator.Publish(new LibraryScanProgress(library.Id, percentCompletion));
 
                         // TODO: figure out how to rebuild playlists
                         Either<BaseError, MediaItemScanResult<PlexMovie>> maybeMovie = await _movieRepository
-                            .GetOrAdd(plexMediaSourceLibrary, incoming)
+                            .GetOrAdd(library, incoming)
                             .BindT(existing => UpdateStatistics(existing, incoming, connection, token))
-                            .BindT(existing => UpdateMetadata(existing, incoming))
+                            .BindT(existing => UpdateMetadata(existing, incoming, library, connection, token))
                             .BindT(existing => UpdateArtwork(existing, incoming));
 
                         await maybeMovie.Match(
@@ -92,16 +92,16 @@ namespace ErsatzTV.Core.Plex
                     }
 
                     var movieKeys = movieEntries.Map(s => s.Key).ToList();
-                    List<int> ids = await _movieRepository.RemoveMissingPlexMovies(plexMediaSourceLibrary, movieKeys);
+                    List<int> ids = await _movieRepository.RemoveMissingPlexMovies(library, movieKeys);
                     await _searchIndex.RemoveItems(ids);
 
-                    await _mediator.Publish(new LibraryScanProgress(plexMediaSourceLibrary.Id, 0));
+                    await _mediator.Publish(new LibraryScanProgress(library.Id, 0));
                 },
                 error =>
                 {
                     _logger.LogWarning(
                         "Error synchronizing plex library {Path}: {Error}",
-                        plexMediaSourceLibrary.Name,
+                        library.Name,
                         error.Value);
 
                     return Task.CompletedTask;
@@ -148,73 +148,114 @@ namespace ErsatzTV.Core.Plex
 
         private async Task<Either<BaseError, MediaItemScanResult<PlexMovie>>> UpdateMetadata(
             MediaItemScanResult<PlexMovie> result,
-            PlexMovie incoming)
+            PlexMovie incoming,
+            PlexLibrary library,
+            PlexConnection connection,
+            PlexServerAuthToken token)
         {
             PlexMovie existing = result.Item;
             MovieMetadata existingMetadata = existing.MovieMetadata.Head();
-            MovieMetadata incomingMetadata = incoming.MovieMetadata.Head();
 
-            if (incomingMetadata.DateUpdated > existingMetadata.DateUpdated)
+            if (result.IsAdded || incoming.MovieMetadata.Head().DateUpdated > existingMetadata.DateUpdated)
             {
                 _logger.LogDebug(
                     "Refreshing {Attribute} from {Path}",
                     "Plex Metadata",
                     existing.MediaVersions.Head().MediaFiles.Head().Path);
 
-                foreach (Genre genre in existingMetadata.Genres
-                    .Filter(g => incomingMetadata.Genres.All(g2 => g2.Name != g.Name))
-                    .ToList())
-                {
-                    existingMetadata.Genres.Remove(genre);
-                    if (await _metadataRepository.RemoveGenre(genre))
-                    {
-                        result.IsUpdated = true;
-                    }
-                }
+                Either<BaseError, MovieMetadata> maybeMetadata =
+                    await _plexServerApiClient.GetMovieMetadata(
+                        library,
+                        incoming.Key.Split("/").Last(),
+                        connection,
+                        token);
 
-                foreach (Genre genre in incomingMetadata.Genres
-                    .Filter(g => existingMetadata.Genres.All(g2 => g2.Name != g.Name))
-                    .ToList())
-                {
-                    existingMetadata.Genres.Add(genre);
-                    if (await _movieRepository.AddGenre(existingMetadata, genre))
+                await maybeMetadata.Match(
+                    async fullMetadata =>
                     {
-                        result.IsUpdated = true;
-                    }
-                }
+                        foreach (Genre genre in existingMetadata.Genres
+                            .Filter(g => fullMetadata.Genres.All(g2 => g2.Name != g.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Genres.Remove(genre);
+                            if (await _metadataRepository.RemoveGenre(genre))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
 
-                foreach (Studio studio in existingMetadata.Studios
-                    .Filter(s => incomingMetadata.Studios.All(s2 => s2.Name != s.Name))
-                    .ToList())
-                {
-                    existingMetadata.Studios.Remove(studio);
-                    if (await _metadataRepository.RemoveStudio(studio))
-                    {
-                        result.IsUpdated = true;
-                    }
-                }
+                        foreach (Genre genre in fullMetadata.Genres
+                            .Filter(g => existingMetadata.Genres.All(g2 => g2.Name != g.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Genres.Add(genre);
+                            if (await _movieRepository.AddGenre(existingMetadata, genre))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
 
-                foreach (Studio studio in incomingMetadata.Studios
-                    .Filter(s => existingMetadata.Studios.All(s2 => s2.Name != s.Name))
-                    .ToList())
-                {
-                    existingMetadata.Studios.Add(studio);
-                    if (await _movieRepository.AddStudio(existingMetadata, studio))
-                    {
-                        result.IsUpdated = true;
-                    }
-                }
+                        foreach (Studio studio in existingMetadata.Studios
+                            .Filter(s => fullMetadata.Studios.All(s2 => s2.Name != s.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Studios.Remove(studio);
+                            if (await _metadataRepository.RemoveStudio(studio))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
 
-                if (incomingMetadata.SortTitle != existingMetadata.SortTitle)
-                {
-                    existingMetadata.SortTitle = incomingMetadata.SortTitle;
-                    if (await _movieRepository.UpdateSortTitle(existingMetadata))
-                    {
-                        result.IsUpdated = true;
-                    }
-                }
+                        foreach (Studio studio in fullMetadata.Studios
+                            .Filter(s => existingMetadata.Studios.All(s2 => s2.Name != s.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Studios.Add(studio);
+                            if (await _movieRepository.AddStudio(existingMetadata, studio))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
 
-                await _metadataRepository.MarkAsUpdated(existingMetadata, incomingMetadata.DateUpdated);
+                        foreach (Actor actor in existingMetadata.Actors
+                            .Filter(
+                                a => fullMetadata.Actors.All(
+                                    a2 => a2.Name != a.Name || a.Artwork == null && a2.Artwork != null))
+                            .ToList())
+                        {
+                            existingMetadata.Actors.Remove(actor);
+                            if (await _metadataRepository.RemoveActor(actor))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
+
+                        foreach (Actor actor in fullMetadata.Actors
+                            .Filter(a => existingMetadata.Actors.All(a2 => a2.Name != a.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Actors.Add(actor);
+                            if (await _movieRepository.AddActor(existingMetadata, actor))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
+
+                        if (fullMetadata.SortTitle != existingMetadata.SortTitle)
+                        {
+                            existingMetadata.SortTitle = fullMetadata.SortTitle;
+                            if (await _movieRepository.UpdateSortTitle(existingMetadata))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
+
+                        if (result.IsUpdated)
+                        {
+                            await _metadataRepository.MarkAsUpdated(existingMetadata, fullMetadata.DateUpdated);
+                        }
+                    },
+                    _ => Task.CompletedTask);
 
                 // TODO: update other metadata?
             }

ErsatzTV.Core/Plex/PlexTelevisionLibraryScanner.cs

@@ -46,10 +46,10 @@ namespace ErsatzTV.Core.Plex
         public async Task<Either<BaseError, Unit>> ScanLibrary(
             PlexConnection connection,
             PlexServerAuthToken token,
-            PlexLibrary plexMediaSourceLibrary)
+            PlexLibrary library)
         {
             Either<BaseError, List<PlexShow>> entries = await _plexServerApiClient.GetShowLibraryContents(
-                plexMediaSourceLibrary,
+                library,
                 connection,
                 token);
 
@@ -59,18 +59,18 @@ namespace ErsatzTV.Core.Plex
                     foreach (PlexShow incoming in showEntries)
                     {
                         decimal percentCompletion = (decimal) showEntries.IndexOf(incoming) / showEntries.Count;
-                        await _mediator.Publish(new LibraryScanProgress(plexMediaSourceLibrary.Id, percentCompletion));
+                        await _mediator.Publish(new LibraryScanProgress(library.Id, percentCompletion));
 
                         // TODO: figure out how to rebuild playlists
                         Either<BaseError, MediaItemScanResult<PlexShow>> maybeShow = await _televisionRepository
-                            .GetOrAddPlexShow(plexMediaSourceLibrary, incoming)
-                            .BindT(existing => UpdateMetadata(existing, incoming))
+                            .GetOrAddPlexShow(library, incoming)
+                            .BindT(existing => UpdateMetadata(existing, incoming, library, connection, token))
                             .BindT(existing => UpdateArtwork(existing, incoming));
 
                         await maybeShow.Match(
                             async result =>
                             {
-                                await ScanSeasons(plexMediaSourceLibrary, result.Item, connection, token);
+                                await ScanSeasons(library, result.Item, connection, token);
 
                                 if (result.IsAdded)
                                 {
@@ -95,10 +95,10 @@ namespace ErsatzTV.Core.Plex
 
                     var showKeys = showEntries.Map(s => s.Key).ToList();
                     List<int> ids =
-                        await _televisionRepository.RemoveMissingPlexShows(plexMediaSourceLibrary, showKeys);
+                        await _televisionRepository.RemoveMissingPlexShows(library, showKeys);
                     await _searchIndex.RemoveItems(ids);
 
-                    await _mediator.Publish(new LibraryScanProgress(plexMediaSourceLibrary.Id, 0));
+                    await _mediator.Publish(new LibraryScanProgress(library.Id, 0));
 
                     _searchIndex.Commit();
                     return Unit.Default;
@@ -107,7 +107,7 @@ namespace ErsatzTV.Core.Plex
                 {
                     _logger.LogWarning(
                         "Error synchronizing plex library {Path}: {Error}",
-                        plexMediaSourceLibrary.Name,
+                        library.Name,
                         error.Value);
 
                     return Left<BaseError, Unit>(error).AsTask();
@@ -116,61 +116,100 @@ namespace ErsatzTV.Core.Plex
 
         private async Task<Either<BaseError, MediaItemScanResult<PlexShow>>> UpdateMetadata(
             MediaItemScanResult<PlexShow> result,
-            PlexShow incoming)
+            PlexShow incoming,
+            PlexLibrary library,
+            PlexConnection connection,
+            PlexServerAuthToken token)
         {
             PlexShow existing = result.Item;
             ShowMetadata existingMetadata = existing.ShowMetadata.Head();
-            ShowMetadata incomingMetadata = incoming.ShowMetadata.Head();
 
-            // TODO: this probably doesn't work
-            // plex doesn't seem to update genres returned by the main library call
-            if (incomingMetadata.DateUpdated > existingMetadata.DateUpdated)
+            if (result.IsAdded || incoming.ShowMetadata.Head().DateUpdated > existingMetadata.DateUpdated)
             {
-                foreach (Genre genre in existingMetadata.Genres
-                    .Filter(g => incomingMetadata.Genres.All(g2 => g2.Name != g.Name))
-                    .ToList())
-                {
-                    existingMetadata.Genres.Remove(genre);
-                    if (await _metadataRepository.RemoveGenre(genre))
-                    {
-                        result.IsUpdated = true;
-                    }
-                }
+                Either<BaseError, ShowMetadata> maybeMetadata =
+                    await _plexServerApiClient.GetShowMetadata(
+                        library,
+                        incoming.Key.Replace("/children", string.Empty).Split("/").Last(),
+                        connection,
+                        token);
 
-                foreach (Genre genre in incomingMetadata.Genres
-                    .Filter(g => existingMetadata.Genres.All(g2 => g2.Name != g.Name))
-                    .ToList())
-                {
-                    existingMetadata.Genres.Add(genre);
-                    if (await _televisionRepository.AddGenre(existingMetadata, genre))
+                await maybeMetadata.Match(
+                    async fullMetadata =>
                     {
-                        result.IsUpdated = true;
-                    }
-                }
+                        foreach (Genre genre in existingMetadata.Genres
+                            .Filter(g => fullMetadata.Genres.All(g2 => g2.Name != g.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Genres.Remove(genre);
+                            if (await _metadataRepository.RemoveGenre(genre))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
 
-                foreach (Studio studio in existingMetadata.Studios
-                    .Filter(s => incomingMetadata.Studios.All(s2 => s2.Name != s.Name))
-                    .ToList())
-                {
-                    existingMetadata.Studios.Remove(studio);
-                    if (await _metadataRepository.RemoveStudio(studio))
-                    {
-                        result.IsUpdated = true;
-                    }
-                }
+                        foreach (Genre genre in fullMetadata.Genres
+                            .Filter(g => existingMetadata.Genres.All(g2 => g2.Name != g.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Genres.Add(genre);
+                            if (await _televisionRepository.AddGenre(existingMetadata, genre))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
 
-                foreach (Studio studio in incomingMetadata.Studios
-                    .Filter(s => existingMetadata.Studios.All(s2 => s2.Name != s.Name))
-                    .ToList())
-                {
-                    existingMetadata.Studios.Add(studio);
-                    if (await _televisionRepository.AddStudio(existingMetadata, studio))
-                    {
-                        result.IsUpdated = true;
-                    }
-                }
+                        foreach (Studio studio in existingMetadata.Studios
+                            .Filter(s => fullMetadata.Studios.All(s2 => s2.Name != s.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Studios.Remove(studio);
+                            if (await _metadataRepository.RemoveStudio(studio))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
 
-                await _metadataRepository.MarkAsUpdated(existingMetadata, incomingMetadata.DateUpdated);
+                        foreach (Studio studio in fullMetadata.Studios
+                            .Filter(s => existingMetadata.Studios.All(s2 => s2.Name != s.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Studios.Add(studio);
+                            if (await _televisionRepository.AddStudio(existingMetadata, studio))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
+
+                        foreach (Actor actor in existingMetadata.Actors
+                            .Filter(
+                                a => fullMetadata.Actors.All(
+                                    a2 => a2.Name != a.Name || a.Artwork == null && a2.Artwork != null))
+                            .ToList())
+                        {
+                            existingMetadata.Actors.Remove(actor);
+                            if (await _metadataRepository.RemoveActor(actor))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
+
+                        foreach (Actor actor in fullMetadata.Actors
+                            .Filter(a => existingMetadata.Actors.All(a2 => a2.Name != a.Name))
+                            .ToList())
+                        {
+                            existingMetadata.Actors.Add(actor);
+                            if (await _televisionRepository.AddActor(existingMetadata, actor))
+                            {
+                                result.IsUpdated = true;
+                            }
+                        }
+
+                        if (result.IsUpdated)
+                        {
+                            await _metadataRepository.MarkAsUpdated(existingMetadata, fullMetadata.DateUpdated);
+                        }
+                    },
+                    _ => Task.CompletedTask);
             }
 
             return result;
@@ -345,6 +384,7 @@ namespace ErsatzTV.Core.Plex
             if (incomingMetadata.DateUpdated > existingMetadata.DateUpdated)
             {
                 await UpdateArtworkIfNeeded(existingMetadata, incomingMetadata, ArtworkKind.Thumbnail);
+                await _metadataRepository.MarkAsUpdated(existingMetadata, incomingMetadata.DateUpdated);
             }
 
             return existing;

ErsatzTV.Infrastructure/Data/Configurations/Metadata/ActorConfiguration.cs

@@ -0,0 +1,19 @@
+using ErsatzTV.Core.Domain;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ErsatzTV.Infrastructure.Data.Configurations
+{
+    public class ActorConfiguration : IEntityTypeConfiguration<Actor>
+    {
+        public void Configure(EntityTypeBuilder<Actor> builder)
+        {
+            builder.ToTable("Actor");
+
+            builder.HasOne(a => a.Artwork)
+                .WithOne()
+                .HasForeignKey<Actor>(a => a.ArtworkId)
+                .OnDelete(DeleteBehavior.Cascade);
+        }
+    }
+}

ErsatzTV.Infrastructure/Data/Configurations/Metadata/EpisodeMetadataConfiguration.cs

@@ -13,6 +13,10 @@ namespace ErsatzTV.Infrastructure.Data.Configurations
             builder.HasMany(em => em.Artwork)
                 .WithOne()
                 .OnDelete(DeleteBehavior.Cascade);
+
+            builder.HasMany(em => em.Actors)
+                .WithOne()
+                .OnDelete(DeleteBehavior.Cascade);
         }
     }
 }

ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs

@@ -25,6 +25,10 @@ namespace ErsatzTV.Infrastructure.Data.Configurations
             builder.HasMany(mm => mm.Studios)
                 .WithOne()
                 .OnDelete(DeleteBehavior.Cascade);
+
+            builder.HasMany(mm => mm.Actors)
+                .WithOne()
+                .OnDelete(DeleteBehavior.Cascade);
         }
     }
 }

ErsatzTV.Infrastructure/Data/Configurations/Metadata/ShowMetadataConfiguration.cs

@@ -25,6 +25,10 @@ namespace ErsatzTV.Infrastructure.Data.Configurations
             builder.HasMany(sm => sm.Studios)
                 .WithOne()
                 .OnDelete(DeleteBehavior.Cascade);
+
+            builder.HasMany(sm => sm.Actors)
+                .WithOne()
+                .OnDelete(DeleteBehavior.Cascade);
         }
     }
 }

ErsatzTV.Infrastructure/Data/Repositories/ArtistRepository.cs

@@ -103,7 +103,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             await dbContext.SaveChangesAsync();
             return ids;
         }
-        
+
         public async Task<Option<Artist>> GetArtist(int artistId)
         {
             await using TvContext dbContext = _dbContextFactory.CreateDbContext();

ErsatzTV.Infrastructure/Data/Repositories/ChannelRepository.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
+using Dapper;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
 using LanguageExt;
@@ -11,9 +13,14 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
 {
     public class ChannelRepository : IChannelRepository
     {
+        private readonly IDbConnection _dbConnection;
         private readonly TvContext _dbContext;
 
-        public ChannelRepository(TvContext dbContext) => _dbContext = dbContext;
+        public ChannelRepository(TvContext dbContext, IDbConnection dbConnection)
+        {
+            _dbContext = dbContext;
+            _dbConnection = dbConnection;
+        }
 
         public async Task<Channel> Add(Channel channel)
         {
@@ -67,6 +74,11 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(i => i.MediaItem)
                 .ThenInclude(i => (i as MusicVideo).MusicVideoMetadata)
                 .ThenInclude(mm => mm.Artwork)
+                .Include(c => c.Playouts)
+                .ThenInclude(p => p.Items)
+                .ThenInclude(i => i.MediaItem)
+                .ThenInclude(i => (i as MusicVideo).Artist)
+                .ThenInclude(a => a.ArtistMetadata)
                 .ToListAsync();
 
         public Task Update(Channel channel)
@@ -81,5 +93,10 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             _dbContext.Channels.Remove(channel);
             await _dbContext.SaveChangesAsync();
         }
+
+        public Task<int> CountPlayouts(int channelId) =>
+            _dbConnection.QuerySingleAsync<int>(
+                @"SELECT COUNT(*) FROM Playout WHERE ChannelId = @ChannelId",
+                new { ChannelId = channelId });
     }
 }

ErsatzTV.Infrastructure/Data/Repositories/MediaCollectionRepository.cs

@@ -183,7 +183,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                     ORDER BY Name
                     LIMIT {0} OFFSET {1}",
                     pageSize,
-                    (pageNumber - 1) * pageSize)
+                    pageNumber * pageSize)
                 .AsNoTracking()
                 .ToListAsync();
         }

ErsatzTV.Infrastructure/Data/Repositories/MetadataRepository.cs

@@ -22,6 +22,10 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             _dbConnection = dbConnection;
         }
 
+        public Task<bool> RemoveActor(Actor actor) =>
+            _dbConnection.ExecuteAsync("DELETE FROM Actor WHERE Id = @ActorId", new { ActorId = actor.Id })
+                .Map(result => result > 0);
+
         public async Task<bool> Update(Metadata metadata)
         {
             await using TvContext dbContext = _dbContextFactory.CreateDbContext();
@@ -33,16 +37,44 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
         {
             await using TvContext dbContext = _dbContextFactory.CreateDbContext();
             dbContext.Entry(metadata).State = EntityState.Added;
-            foreach (Genre genre in metadata.Genres)
+
+            foreach (Genre genre in Optional(metadata.Genres).Flatten())
             {
                 dbContext.Entry(genre).State = EntityState.Added;
             }
 
-            foreach (Tag tag in metadata.Tags)
+            foreach (Tag tag in Optional(metadata.Tags).Flatten())
             {
                 dbContext.Entry(tag).State = EntityState.Added;
             }
 
+            foreach (Studio studio in Optional(metadata.Studios).Flatten())
+            {
+                dbContext.Entry(studio).State = EntityState.Added;
+            }
+
+            if (metadata is ArtistMetadata artistMetadata)
+            {
+                foreach (Style style in Optional(artistMetadata.Styles).Flatten())
+                {
+                    dbContext.Entry(style).State = EntityState.Added;
+                }
+
+                foreach (Mood mood in Optional(artistMetadata.Moods).Flatten())
+                {
+                    dbContext.Entry(mood).State = EntityState.Added;
+                }
+            }
+
+            foreach (Actor actor in Optional(metadata.Actors).Flatten())
+            {
+                dbContext.Entry(actor).State = EntityState.Added;
+                if (actor.Artwork != null)
+                {
+                    dbContext.Entry(actor.Artwork).State = EntityState.Added;
+                }
+            }
+
             return await dbContext.SaveChangesAsync() > 0;
         }
 
@@ -190,6 +222,11 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             _dbConnection.ExecuteAsync(
                 @"UPDATE MovieMetadata SET DateUpdated = @DateUpdated WHERE Id = @Id",
                 new { DateUpdated = dateUpdated, metadata.Id }).ToUnit();
+        
+        public Task<Unit> MarkAsUpdated(EpisodeMetadata metadata, DateTime dateUpdated) =>
+            _dbConnection.ExecuteAsync(
+                @"UPDATE EpisodeMetadata SET DateUpdated = @DateUpdated WHERE Id = @Id",
+                new { DateUpdated = dateUpdated, metadata.Id }).ToUnit();
 
         public Task<bool> RemoveGenre(Genre genre) =>
             _dbConnection.ExecuteAsync("DELETE FROM Genre WHERE Id = @GenreId", new { GenreId = genre.Id })

ErsatzTV.Infrastructure/Data/Repositories/MovieRepository.cs

@@ -43,6 +43,11 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(m => m.Tags)
                 .Include(m => m.MovieMetadata)
                 .ThenInclude(m => m.Studios)
+                .Include(m => m.MovieMetadata)
+                .ThenInclude(m => m.Actors)
+                .ThenInclude(a => a.Artwork)
+                .Include(m => m.MediaVersions)
+                .ThenInclude(mv => mv.Streams)
                 .OrderBy(m => m.Id)
                 .SingleOrDefaultAsync(m => m.Id == movieId)
                 .Map(Optional);
@@ -60,6 +65,9 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(mm => mm.Tags)
                 .Include(i => i.MovieMetadata)
                 .ThenInclude(mm => mm.Studios)
+                .Include(i => i.MovieMetadata)
+                .ThenInclude(mm => mm.Actors)
+                .ThenInclude(a => a.Artwork)
                 .Include(i => i.LibraryPath)
                 .ThenInclude(lp => lp.Library)
                 .Include(i => i.MediaVersions)
@@ -90,6 +98,9 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .Include(i => i.MovieMetadata)
                 .ThenInclude(mm => mm.Studios)
                 .Include(i => i.MovieMetadata)
+                .ThenInclude(mm => mm.Actors)
+                .ThenInclude(a => a.Artwork)
+                .Include(i => i.MovieMetadata)
                 .ThenInclude(mm => mm.Artwork)
                 .Include(i => i.MediaVersions)
                 .ThenInclude(mv => mv.MediaFiles)
@@ -103,7 +114,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             return await maybeExisting.Match(
                 plexMovie =>
                     Right<BaseError, MediaItemScanResult<PlexMovie>>(
-                        new MediaItemScanResult<PlexMovie>(plexMovie) { IsAdded = true }).AsTask(),
+                        new MediaItemScanResult<PlexMovie>(plexMovie) { IsAdded = false }).AsTask(),
                 async () => await AddPlexMovie(context, library, item));
         }
 
@@ -185,6 +196,31 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 "INSERT INTO Studio (Name, MovieMetadataId) VALUES (@Name, @MetadataId)",
                 new { studio.Name, MetadataId = metadata.Id }).Map(result => result > 0);
 
+        public async Task<bool> AddActor(MovieMetadata metadata, Actor actor)
+        {
+            int? artworkId = null;
+
+            if (actor.Artwork != null)
+            {
+                artworkId = await _dbConnection.QuerySingleAsync<int>(
+                    @"INSERT INTO Artwork (ArtworkKind, DateAdded, DateUpdated, Path)
+                      VALUES (@ArtworkKind, @DateAdded, @DateUpdated, @Path);
+                      SELECT last_insert_rowid()",
+                    new
+                    {
+                        ArtworkKind = (int) actor.Artwork.ArtworkKind,
+                        actor.Artwork.DateAdded,
+                        actor.Artwork.DateUpdated,
+                        actor.Artwork.Path
+                    });
+            }
+
+            return await _dbConnection.ExecuteAsync(
+                    "INSERT INTO Actor (Name, Role, \"Order\", MovieMetadataId, ArtworkId) VALUES (@Name, @Role, @Order, @MetadataId, @ArtworkId)",
+                    new { actor.Name, actor.Role, actor.Order, MetadataId = metadata.Id, ArtworkId = artworkId })
+                .Map(result => result > 0);
+        }
+
         public async Task<List<int>> RemoveMissingPlexMovies(PlexLibrary library, List<string> movieKeys)
         {
             List<int> ids = await _dbConnection.QueryAsync<int>(

ErsatzTV.Infrastructure/Data/Repositories/SearchRepository.cs

@@ -39,6 +39,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(mm => mm.Tags)
                 .Include(mi => (mi as Movie).MovieMetadata)
                 .ThenInclude(mm => mm.Studios)
+                .Include(mi => (mi as Movie).MovieMetadata)
+                .ThenInclude(mm => mm.Actors)
                 .Include(mi => (mi as Movie).MediaVersions)
                 .ThenInclude(mm => mm.Streams)
                 .Include(mi => (mi as Show).ShowMetadata)
@@ -47,6 +49,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(mm => mm.Tags)
                 .Include(mi => (mi as Show).ShowMetadata)
                 .ThenInclude(mm => mm.Studios)
+                .Include(mi => (mi as Show).ShowMetadata)
+                .ThenInclude(mm => mm.Actors)
                 .Include(mi => (mi as MusicVideo).MusicVideoMetadata)
                 .ThenInclude(mm => mm.Genres)
                 .Include(mi => (mi as MusicVideo).MusicVideoMetadata)

ErsatzTV.Infrastructure/Data/Repositories/TelevisionRepository.cs

@@ -55,6 +55,9 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(sm => sm.Tags)
                 .Include(s => s.ShowMetadata)
                 .ThenInclude(sm => sm.Studios)
+                .Include(s => s.ShowMetadata)
+                .ThenInclude(sm => sm.Actors)
+                .ThenInclude(a => a.Artwork)
                 .OrderBy(s => s.Id)
                 .SingleOrDefaultAsync()
                 .Map(Optional);
@@ -188,6 +191,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(e => e.Season)
                 .ThenInclude(s => s.Show)
                 .ThenInclude(s => s.ShowMetadata)
+                .ThenInclude(sm => sm.Actors)
+                .ThenInclude(a => a.Artwork)
                 .OrderBy(em => em.Episode.EpisodeNumber)
                 .Skip((pageNumber - 1) * pageSize)
                 .Take(pageSize)
@@ -217,6 +222,9 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                         .ThenInclude(sm => sm.Tags)
                         .Include(s => s.ShowMetadata)
                         .ThenInclude(sm => sm.Studios)
+                        .Include(s => s.ShowMetadata)
+                        .ThenInclude(sm => sm.Actors)
+                        .ThenInclude(a => a.Artwork)
                         .Include(s => s.LibraryPath)
                         .ThenInclude(lp => lp.Library)
                         .OrderBy(s => s.Id)
@@ -239,6 +247,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 metadata.Genres ??= new List<Genre>();
                 metadata.Tags ??= new List<Tag>();
                 metadata.Studios ??= new List<Studio>();
+                metadata.Actors ??= new List<Actor>();
                 var show = new Show
                 {
                     LibraryPathId = libraryPathId,
@@ -283,6 +292,9 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
             Option<Episode> maybeExisting = await dbContext.Episodes
                 .Include(i => i.EpisodeMetadata)
                 .ThenInclude(em => em.Artwork)
+                .Include(i => i.EpisodeMetadata)
+                .ThenInclude(em => em.Actors)
+                .ThenInclude(a => a.Artwork)
                 .Include(i => i.MediaVersions)
                 .ThenInclude(mv => mv.MediaFiles)
                 .Include(i => i.MediaVersions)
@@ -382,6 +394,9 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .Include(i => i.ShowMetadata)
                 .ThenInclude(sm => sm.Studios)
                 .Include(i => i.ShowMetadata)
+                .ThenInclude(sm => sm.Actors)
+                .ThenInclude(a => a.Artwork)
+                .Include(i => i.ShowMetadata)
                 .ThenInclude(sm => sm.Artwork)
                 .Include(i => i.LibraryPath)
                 .ThenInclude(lp => lp.Library)
@@ -390,7 +405,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
 
             return await maybeExisting.Match(
                 plexShow => Right<BaseError, MediaItemScanResult<PlexShow>>(
-                    new MediaItemScanResult<PlexShow>(plexShow) { IsAdded = true }).AsTask(),
+                    new MediaItemScanResult<PlexShow>(plexShow) { IsAdded = false }).AsTask(),
                 async () => await AddPlexShow(dbContext, library, item));
         }
 
@@ -420,6 +435,9 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 .ThenInclude(mv => mv.MediaFiles)
                 .Include(i => i.MediaVersions)
                 .ThenInclude(mv => mv.Streams)
+                .Include(e => e.EpisodeMetadata)
+                .ThenInclude(em => em.Actors)
+                .ThenInclude(a => a.Artwork)
                 .OrderBy(i => i.Key)
                 .SingleOrDefaultAsync(i => i.Key == item.Key);
 
@@ -507,6 +525,56 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                 "INSERT INTO Studio (Name, ShowMetadataId) VALUES (@Name, @MetadataId)",
                 new { studio.Name, MetadataId = metadata.Id }).Map(result => result > 0);
 
+        public async Task<bool> AddActor(ShowMetadata metadata, Actor actor)
+        {
+            int? artworkId = null;
+
+            if (actor.Artwork != null)
+            {
+                artworkId = await _dbConnection.QuerySingleAsync<int>(
+                    @"INSERT INTO Artwork (ArtworkKind, DateAdded, DateUpdated, Path)
+                      VALUES (@ArtworkKind, @DateAdded, @DateUpdated, @Path);
+                      SELECT last_insert_rowid()",
+                    new
+                    {
+                        ArtworkKind = (int) actor.Artwork.ArtworkKind,
+                        actor.Artwork.DateAdded,
+                        actor.Artwork.DateUpdated,
+                        actor.Artwork.Path
+                    });
+            }
+
+            return await _dbConnection.ExecuteAsync(
+                    "INSERT INTO Actor (Name, Role, \"Order\", ShowMetadataId, ArtworkId) VALUES (@Name, @Role, @Order, @MetadataId, @ArtworkId)",
+                    new { actor.Name, actor.Role, actor.Order, MetadataId = metadata.Id, ArtworkId = artworkId })
+                .Map(result => result > 0);
+        }
+
+        public async Task<bool> AddActor(EpisodeMetadata metadata, Actor actor)
+        {
+            int? artworkId = null;
+
+            if (actor.Artwork != null)
+            {
+                artworkId = await _dbConnection.QuerySingleAsync<int>(
+                    @"INSERT INTO Artwork (ArtworkKind, DateAdded, DateUpdated, Path)
+                      VALUES (@ArtworkKind, @DateAdded, @DateUpdated, @Path);
+                      SELECT last_insert_rowid()",
+                    new
+                    {
+                        ArtworkKind = (int) actor.Artwork.ArtworkKind,
+                        actor.Artwork.DateAdded,
+                        actor.Artwork.DateUpdated,
+                        actor.Artwork.Path
+                    });
+            }
+
+            return await _dbConnection.ExecuteAsync(
+                    "INSERT INTO Actor (Name, Role, \"Order\", EpisodeMetadataId, ArtworkId) VALUES (@Name, @Role, @Order, @MetadataId, @ArtworkId)",
+                    new { actor.Name, actor.Role, actor.Order, MetadataId = metadata.Id, ArtworkId = artworkId })
+                .Map(result => result > 0);
+        }
+
         public async Task<List<int>> RemoveMissingPlexShows(PlexLibrary library, List<string> showKeys)
         {
             List<int> ids = await _dbConnection.QueryAsync<int>(
@@ -582,7 +650,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
                         {
                             DateAdded = DateTime.UtcNow,
                             DateUpdated = DateTime.MinValue,
-                            MetadataKind = MetadataKind.Fallback
+                            MetadataKind = MetadataKind.Fallback,
+                            Actors = new List<Actor>()
                         }
                     },
                     MediaVersions = new List<MediaVersion>

ErsatzTV.Infrastructure/GitHub/GitHubApiClient.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Interfaces.GitHub;
+using LanguageExt;
+using Refit;
+
+namespace ErsatzTV.Infrastructure.GitHub
+{
+    public class GitHubApiClient : IGitHubApiClient
+    {
+        public async Task<Either<BaseError, string>> GetLatestReleaseNotes()
+        {
+            try
+            {
+                IGitHubApi service = RestService.For<IGitHubApi>("https://api.github.com");
+                return await service.GetReleases().Map(releases => releases.Head().Body);
+            }
+            catch (Exception ex)
+            {
+                return BaseError.New(ex.ToString());
+            }
+        }
+
+        public async Task<Either<BaseError, string>> GetReleaseNotes(string tag)
+        {
+            try
+            {
+                IGitHubApi service = RestService.For<IGitHubApi>("https://api.github.com");
+                return await service.GetTag(tag).Map(t => t.Body);
+            }
+            catch (Exception ex)
+            {
+                return BaseError.New(ex.ToString());
+            }
+        }
+    }
+}

ErsatzTV.Infrastructure/GitHub/IGitHubApi.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using ErsatzTV.Infrastructure.GitHub.Models;
+using Refit;
+
+namespace ErsatzTV.Infrastructure.GitHub
+{
+    [Headers("Accept: application/vnd.github.v3+json", "User-Agent: jasongdove/ErsatzTV")]
+    public interface IGitHubApi
+    {
+        [Get("/repos/jasongdove/ErsatzTV/releases")]
+        public Task<List<GitHubTag>> GetReleases();
+
+        [Get("/repos/jasongdove/ErsatzTV/releases/tags/{tag}")]
+        public Task<GitHubTag> GetTag(string tag);
+    }
+}

ErsatzTV.Infrastructure/GitHub/Models/GitHubTag.cs

@@ -0,0 +1,7 @@
+namespace ErsatzTV.Infrastructure.GitHub.Models
+{
+    public class GitHubTag
+    {
+        public string Body { get; set; }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20210407113048_Delete_Orphan_GenreTagStudio.cs

@@ -9,25 +9,25 @@ namespace ErsatzTV.Infrastructure.Migrations
             migrationBuilder.Sql(
                 @"DELETE FROM Genre
                 WHERE MovieMetadataId NOT IN (SELECT Id FROM MovieMetadata)
-                OR ShowMetadataId NOT IN (SELECT Id FROM Show)
-                OR SeasonMetadataId NOT IN (SELECT Id FROM Season)
-                OR EpisodeMetadataId NOT IN (SELECT Id FROM Episode)
+                OR ShowMetadataId NOT IN (SELECT Id FROM ShowMetadata)
+                OR SeasonMetadataId NOT IN (SELECT Id FROM SeasonMetadata)
+                OR EpisodeMetadataId NOT IN (SELECT Id FROM EpisodeMetadata)
                 OR MusicVideoMetadataId NOT IN (SELECT Id FROM MusicVideoMetadata)");
 
             migrationBuilder.Sql(
                 @"DELETE FROM Tag
                 WHERE MovieMetadataId NOT IN (SELECT Id FROM MovieMetadata)
-                OR ShowMetadataId NOT IN (SELECT Id FROM Show)
-                OR SeasonMetadataId NOT IN (SELECT Id FROM Season)
-                OR EpisodeMetadataId NOT IN (SELECT Id FROM Episode)
+                OR ShowMetadataId NOT IN (SELECT Id FROM ShowMetadata)
+                OR SeasonMetadataId NOT IN (SELECT Id FROM SeasonMetadata)
+                OR EpisodeMetadataId NOT IN (SELECT Id FROM EpisodeMetadata)
                 OR MusicVideoMetadataId NOT IN (SELECT Id FROM MusicVideoMetadata)");
 
             migrationBuilder.Sql(
                 @"DELETE FROM Studio
                 WHERE MovieMetadataId NOT IN (SELECT Id FROM MovieMetadata)
-                OR ShowMetadataId NOT IN (SELECT Id FROM Show)
-                OR SeasonMetadataId NOT IN (SELECT Id FROM Season)
-                OR EpisodeMetadataId NOT IN (SELECT Id FROM Episode)
+                OR ShowMetadataId NOT IN (SELECT Id FROM ShowMetadata)
+                OR SeasonMetadataId NOT IN (SELECT Id FROM SeasonMetadata)
+                OR EpisodeMetadataId NOT IN (SELECT Id FROM EpisodeMetadata)
                 OR MusicVideoMetadataId NOT IN (SELECT Id FROM MusicVideoMetadata)");
         }
 

ErsatzTV.Infrastructure/Migrations/20210410232003_Update_LibraryLastScan_Metadata.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Update_LibraryLastScan_Metadata : 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 = 2)");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaKind = 2");
+
+            migrationBuilder.Sql(
+                @"UPDATE ShowMetadata SET DateUpdated = '0001-01-01 00:00:00' WHERE MetadataKind = 1");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20210414210456_Add_Actor.cs

@@ -0,0 +1,101 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_Actor : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                "Actor",
+                table => new
+                {
+                    Id = table.Column<int>("INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Name = table.Column<string>("TEXT", nullable: true),
+                    Role = table.Column<string>("TEXT", nullable: true),
+                    Order = table.Column<int>("INTEGER", nullable: true),
+                    ArtistMetadataId = table.Column<int>("INTEGER", nullable: true),
+                    EpisodeMetadataId = table.Column<int>("INTEGER", nullable: true),
+                    MovieMetadataId = table.Column<int>("INTEGER", nullable: true),
+                    MusicVideoMetadataId = table.Column<int>("INTEGER", nullable: true),
+                    SeasonMetadataId = table.Column<int>("INTEGER", nullable: true),
+                    ShowMetadataId = table.Column<int>("INTEGER", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Actor", x => x.Id);
+                    table.ForeignKey(
+                        "FK_Actor_ArtistMetadata_ArtistMetadataId",
+                        x => x.ArtistMetadataId,
+                        "ArtistMetadata",
+                        "Id",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        "FK_Actor_EpisodeMetadata_EpisodeMetadataId",
+                        x => x.EpisodeMetadataId,
+                        "EpisodeMetadata",
+                        "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        "FK_Actor_MovieMetadata_MovieMetadataId",
+                        x => x.MovieMetadataId,
+                        "MovieMetadata",
+                        "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        "FK_Actor_MusicVideoMetadata_MusicVideoMetadataId",
+                        x => x.MusicVideoMetadataId,
+                        "MusicVideoMetadata",
+                        "Id",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        "FK_Actor_SeasonMetadata_SeasonMetadataId",
+                        x => x.SeasonMetadataId,
+                        "SeasonMetadata",
+                        "Id",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        "FK_Actor_ShowMetadata_ShowMetadataId",
+                        x => x.ShowMetadataId,
+                        "ShowMetadata",
+                        "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                "IX_Actor_ArtistMetadataId",
+                "Actor",
+                "ArtistMetadataId");
+
+            migrationBuilder.CreateIndex(
+                "IX_Actor_EpisodeMetadataId",
+                "Actor",
+                "EpisodeMetadataId");
+
+            migrationBuilder.CreateIndex(
+                "IX_Actor_MovieMetadataId",
+                "Actor",
+                "MovieMetadataId");
+
+            migrationBuilder.CreateIndex(
+                "IX_Actor_MusicVideoMetadataId",
+                "Actor",
+                "MusicVideoMetadataId");
+
+            migrationBuilder.CreateIndex(
+                "IX_Actor_SeasonMetadataId",
+                "Actor",
+                "SeasonMetadataId");
+
+            migrationBuilder.CreateIndex(
+                "IX_Actor_ShowMetadataId",
+                "Actor",
+                "ShowMetadataId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder) =>
+            migrationBuilder.DropTable(
+                "Actor");
+    }
+}

ErsatzTV.Infrastructure/Migrations/20210414212448_Reset_MetadataDateUpdated_Actor.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Reset_MetadataDateUpdated_Actor : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"UPDATE MovieMetadata SET DateUpdated = '0001-01-01 00:00:00'");
+            migrationBuilder.Sql(@"UPDATE ShowMetadata SET DateUpdated = '0001-01-01 00:00:00'");
+            migrationBuilder.Sql(@"UPDATE EpisodeMetadata SET DateUpdated = '0001-01-01 00:00:00'");
+
+            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 IN (1, 2))");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaKind IN (1, 2)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/20210416122613_Add_Actor_Artwork.cs

@@ -0,0 +1,45 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_Actor_Artwork : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                "ArtworkId",
+                "Actor",
+                "INTEGER",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                "IX_Actor_ArtworkId",
+                "Actor",
+                "ArtworkId",
+                unique: true);
+
+            migrationBuilder.AddForeignKey(
+                "FK_Actor_Artwork_ArtworkId",
+                "Actor",
+                "ArtworkId",
+                "Artwork",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                "FK_Actor_Artwork_ArtworkId",
+                "Actor");
+
+            migrationBuilder.DropIndex(
+                "IX_Actor_ArtworkId",
+                "Actor");
+
+            migrationBuilder.DropColumn(
+                "ArtworkId",
+                "Actor");
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/TvContextModelSnapshot.cs

@@ -16,6 +16,64 @@ namespace ErsatzTV.Infrastructure.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "5.0.4");
 
+            modelBuilder.Entity(
+                "ErsatzTV.Core.Domain.Actor",
+                b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ArtistMetadataId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ArtworkId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("EpisodeMetadataId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MovieMetadataId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MusicVideoMetadataId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SeasonMetadataId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ShowMetadataId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ArtistMetadataId");
+
+                    b.HasIndex("ArtworkId")
+                        .IsUnique();
+
+                    b.HasIndex("EpisodeMetadataId");
+
+                    b.HasIndex("MovieMetadataId");
+
+                    b.HasIndex("MusicVideoMetadataId");
+
+                    b.HasIndex("SeasonMetadataId");
+
+                    b.HasIndex("ShowMetadataId");
+
+                    b.ToTable("Actor");
+                });
+
             modelBuilder.Entity(
                 "ErsatzTV.Core.Domain.ArtistMetadata",
                 b =>
@@ -1391,6 +1449,45 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.ToTable("PlexShow");
                 });
 
+            modelBuilder.Entity(
+                "ErsatzTV.Core.Domain.Actor",
+                b =>
+                {
+                    b.HasOne("ErsatzTV.Core.Domain.ArtistMetadata", null)
+                        .WithMany("Actors")
+                        .HasForeignKey("ArtistMetadataId");
+
+                    b.HasOne("ErsatzTV.Core.Domain.Artwork", "Artwork")
+                        .WithOne()
+                        .HasForeignKey("ErsatzTV.Core.Domain.Actor", "ArtworkId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ErsatzTV.Core.Domain.EpisodeMetadata", null)
+                        .WithMany("Actors")
+                        .HasForeignKey("EpisodeMetadataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ErsatzTV.Core.Domain.MovieMetadata", null)
+                        .WithMany("Actors")
+                        .HasForeignKey("MovieMetadataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ErsatzTV.Core.Domain.MusicVideoMetadata", null)
+                        .WithMany("Actors")
+                        .HasForeignKey("MusicVideoMetadataId");
+
+                    b.HasOne("ErsatzTV.Core.Domain.SeasonMetadata", null)
+                        .WithMany("Actors")
+                        .HasForeignKey("SeasonMetadataId");
+
+                    b.HasOne("ErsatzTV.Core.Domain.ShowMetadata", null)
+                        .WithMany("Actors")
+                        .HasForeignKey("ShowMetadataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("Artwork");
+                });
+
             modelBuilder.Entity(
                 "ErsatzTV.Core.Domain.ArtistMetadata",
                 b =>
@@ -2189,6 +2286,8 @@ namespace ErsatzTV.Infrastructure.Migrations
                 "ErsatzTV.Core.Domain.ArtistMetadata",
                 b =>
                 {
+                    b.Navigation("Actors");
+
                     b.Navigation("Artwork");
 
                     b.Navigation("Genres");
@@ -2217,6 +2316,8 @@ namespace ErsatzTV.Infrastructure.Migrations
                 "ErsatzTV.Core.Domain.EpisodeMetadata",
                 b =>
                 {
+                    b.Navigation("Actors");
+
                     b.Navigation("Artwork");
 
                     b.Navigation("Genres");
@@ -2247,6 +2348,8 @@ namespace ErsatzTV.Infrastructure.Migrations
                 "ErsatzTV.Core.Domain.MovieMetadata",
                 b =>
                 {
+                    b.Navigation("Actors");
+
                     b.Navigation("Artwork");
 
                     b.Navigation("Genres");
@@ -2260,6 +2363,8 @@ namespace ErsatzTV.Infrastructure.Migrations
                 "ErsatzTV.Core.Domain.MusicVideoMetadata",
                 b =>
                 {
+                    b.Navigation("Actors");
+
                     b.Navigation("Artwork");
 
                     b.Navigation("Genres");
@@ -2291,6 +2396,8 @@ namespace ErsatzTV.Infrastructure.Migrations
                 "ErsatzTV.Core.Domain.SeasonMetadata",
                 b =>
                 {
+                    b.Navigation("Actors");
+
                     b.Navigation("Artwork");
 
                     b.Navigation("Genres");
@@ -2304,6 +2411,8 @@ namespace ErsatzTV.Infrastructure.Migrations
                 "ErsatzTV.Core.Domain.ShowMetadata",
                 b =>
                 {
+                    b.Navigation("Actors");
+
                     b.Navigation("Artwork");
 
                     b.Navigation("Genres");

ErsatzTV.Infrastructure/Plex/Models/PlexMetadataResponse.cs

@@ -18,5 +18,6 @@ namespace ErsatzTV.Infrastructure.Plex.Models
         public string Studio { get; set; }
         public List<PlexMediaResponse> Media { get; set; }
         public List<PlexGenreResponse> Genre { get; set; }
+        public List<PlexRoleResponse> Role { get; set; }
     }
 }

ErsatzTV.Infrastructure/Plex/Models/PlexRoleResponse.cs

@@ -0,0 +1,9 @@
+namespace ErsatzTV.Infrastructure.Plex.Models
+{
+    public class PlexRoleResponse
+    {
+        public string Tag { get; set; }
+        public string Role { get; set; }
+        public string Thumb { get; set; }
+    }
+}

ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs

@@ -32,6 +32,7 @@ namespace ErsatzTV.Infrastructure.Plex
                     await service.GetLibraries(token.AuthToken).Map(r => r.MediaContainer.Directory);
                 return directory
                     // .Filter(l => l.Hidden == 0)
+                    .Filter(l => l.Type.ToLowerInvariant() is "movie" or "show")
                     .Map(Project)
                     .Somes()
                     .ToList();
@@ -116,6 +117,48 @@ namespace ErsatzTV.Infrastructure.Plex
             }
         }
 
+        public async Task<Either<BaseError, MovieMetadata>> GetMovieMetadata(
+            PlexLibrary library,
+            string key,
+            PlexConnection connection,
+            PlexServerAuthToken token)
+        {
+            try
+            {
+                IPlexServerApi service = RestService.For<IPlexServerApi>(connection.Uri);
+                return await service.GetMetadata(key, token.AuthToken)
+                    .Map(
+                        r => r.MediaContainer.Metadata.Filter(m => m.Media.Count > 0 && m.Media[0].Part.Count > 0)
+                            .HeadOrNone())
+                    .MapT(response => ProjectToMovieMetadata(response, library.MediaSourceId))
+                    .Map(o => o.ToEither<BaseError>("Unable to locate metadata"));
+            }
+            catch (Exception ex)
+            {
+                return BaseError.New(ex.ToString());
+            }
+        }
+
+        public async Task<Either<BaseError, ShowMetadata>> GetShowMetadata(
+            PlexLibrary library,
+            string key,
+            PlexConnection connection,
+            PlexServerAuthToken token)
+        {
+            try
+            {
+                IPlexServerApi service = RestService.For<IPlexServerApi>(connection.Uri);
+                return await service.GetMetadata(key, token.AuthToken)
+                    .Map(r => r.MediaContainer.Metadata.HeadOrNone())
+                    .MapT(response => ProjectToShowMetadata(response, library.MediaSourceId))
+                    .Map(o => o.ToEither<BaseError>("Unable to locate metadata"));
+            }
+            catch (Exception ex)
+            {
+                return BaseError.New(ex.ToString());
+            }
+        }
+
         public async Task<Either<BaseError, MediaVersion>> GetStatistics(
             string key,
             PlexConnection connection,
@@ -167,6 +210,44 @@ namespace ErsatzTV.Infrastructure.Plex
             DateTime dateAdded = DateTimeOffset.FromUnixTimeSeconds(response.AddedAt).DateTime;
             DateTime lastWriteTime = DateTimeOffset.FromUnixTimeSeconds(response.UpdatedAt).DateTime;
 
+            MovieMetadata metadata = ProjectToMovieMetadata(response, mediaSourceId);
+
+            var version = new MediaVersion
+            {
+                Name = "Main",
+                Duration = TimeSpan.FromMilliseconds(media.Duration),
+                Width = media.Width,
+                Height = media.Height,
+                // specifically omit sample aspect ratio
+                DateAdded = dateAdded,
+                DateUpdated = lastWriteTime,
+                MediaFiles = new List<MediaFile>
+                {
+                    new PlexMediaFile
+                    {
+                        PlexId = part.Id,
+                        Key = part.Key,
+                        Path = part.File
+                    }
+                },
+                Streams = new List<MediaStream>()
+            };
+
+            var movie = new PlexMovie
+            {
+                Key = response.Key,
+                MovieMetadata = new List<MovieMetadata> { metadata },
+                MediaVersions = new List<MediaVersion> { version }
+            };
+
+            return movie;
+        }
+
+        private MovieMetadata ProjectToMovieMetadata(PlexMetadataResponse response, int mediaSourceId)
+        {
+            DateTime dateAdded = DateTimeOffset.FromUnixTimeSeconds(response.AddedAt).DateTime;
+            DateTime lastWriteTime = DateTimeOffset.FromUnixTimeSeconds(response.UpdatedAt).DateTime;
+
             var metadata = new MovieMetadata
             {
                 Title = response.Title,
@@ -178,7 +259,9 @@ namespace ErsatzTV.Infrastructure.Plex
                 DateUpdated = lastWriteTime,
                 Genres = Optional(response.Genre).Flatten().Map(g => new Genre { Name = g.Tag }).ToList(),
                 Tags = new List<Tag>(),
-                Studios = new List<Studio>()
+                Studios = new List<Studio>(),
+                Actors = Optional(response.Role).Flatten().Map(r => ProjectToModel(r, dateAdded, lastWriteTime))
+                    .ToList()
             };
 
             if (!string.IsNullOrWhiteSpace(response.Studio))
@@ -221,35 +304,7 @@ namespace ErsatzTV.Infrastructure.Plex
                 metadata.Artwork.Add(artwork);
             }
 
-            var version = new MediaVersion
-            {
-                Name = "Main",
-                Duration = TimeSpan.FromMilliseconds(media.Duration),
-                Width = media.Width,
-                Height = media.Height,
-                // specifically omit sample aspect ratio
-                DateAdded = dateAdded,
-                DateUpdated = lastWriteTime,
-                MediaFiles = new List<MediaFile>
-                {
-                    new PlexMediaFile
-                    {
-                        PlexId = part.Id,
-                        Key = part.Key,
-                        Path = part.File
-                    }
-                },
-                Streams = new List<MediaStream>()
-            };
-
-            var movie = new PlexMovie
-            {
-                Key = response.Key,
-                MovieMetadata = new List<MovieMetadata> { metadata },
-                MediaVersions = new List<MediaVersion> { version }
-            };
-
-            return movie;
+            return metadata;
         }
 
         private Option<MediaVersion> ProjectToMediaVersion(PlexMetadataResponse response)
@@ -324,6 +379,19 @@ namespace ErsatzTV.Infrastructure.Plex
         }
 
         private PlexShow ProjectToShow(PlexMetadataResponse response, int mediaSourceId)
+        {
+            ShowMetadata metadata = ProjectToShowMetadata(response, mediaSourceId);
+
+            var show = new PlexShow
+            {
+                Key = response.Key,
+                ShowMetadata = new List<ShowMetadata> { metadata }
+            };
+
+            return show;
+        }
+
+        private ShowMetadata ProjectToShowMetadata(PlexMetadataResponse response, int mediaSourceId)
         {
             DateTime dateAdded = DateTimeOffset.FromUnixTimeSeconds(response.AddedAt).DateTime;
             DateTime lastWriteTime = DateTimeOffset.FromUnixTimeSeconds(response.UpdatedAt).DateTime;
@@ -339,7 +407,9 @@ namespace ErsatzTV.Infrastructure.Plex
                 DateUpdated = lastWriteTime,
                 Genres = Optional(response.Genre).Flatten().Map(g => new Genre { Name = g.Tag }).ToList(),
                 Tags = new List<Tag>(),
-                Studios = new List<Studio>()
+                Studios = new List<Studio>(),
+                Actors = Optional(response.Role).Flatten().Map(r => ProjectToModel(r, dateAdded, lastWriteTime))
+                    .ToList()
             };
 
             if (!string.IsNullOrWhiteSpace(response.Studio))
@@ -382,13 +452,7 @@ namespace ErsatzTV.Infrastructure.Plex
                 metadata.Artwork.Add(artwork);
             }
 
-            var show = new PlexShow
-            {
-                Key = response.Key,
-                ShowMetadata = new List<ShowMetadata> { metadata }
-            };
-
-            return show;
+            return metadata;
         }
 
         private PlexSeason ProjectToSeason(PlexMetadataResponse response, int mediaSourceId)
@@ -460,7 +524,9 @@ namespace ErsatzTV.Infrastructure.Plex
                 Year = response.Year,
                 Tagline = response.Tagline,
                 DateAdded = dateAdded,
-                DateUpdated = lastWriteTime
+                DateUpdated = lastWriteTime,
+                Actors = Optional(response.Role).Flatten().Map(r => ProjectToModel(r, dateAdded, lastWriteTime))
+                    .ToList()
             };
 
             if (DateTime.TryParse(response.OriginallyAvailableAt, out DateTime releaseDate))
@@ -514,5 +580,22 @@ namespace ErsatzTV.Infrastructure.Plex
 
             return episode;
         }
+
+        private Actor ProjectToModel(PlexRoleResponse role, DateTime dateAdded, DateTime lastWriteTime)
+        {
+            var actor = new Actor { Name = role.Tag, Role = role.Role };
+            if (!string.IsNullOrWhiteSpace(role.Thumb))
+            {
+                actor.Artwork = new Artwork
+                {
+                    Path = role.Thumb,
+                    ArtworkKind = ArtworkKind.Thumbnail,
+                    DateAdded = dateAdded,
+                    DateUpdated = lastWriteTime
+                };
+            }
+
+            return actor;
+        }
     }
 }

ErsatzTV.Infrastructure/Search/SearchIndex.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
@@ -35,6 +36,7 @@ namespace ErsatzTV.Infrastructure.Search
         private const string TagField = "tag";
         private const string PlotField = "plot";
         private const string LibraryNameField = "library_name";
+        private const string LibraryIdField = "library_id";
         private const string TitleAndYearField = "title_and_year";
         private const string JumpLetterField = "jump_letter";
         private const string ReleaseDateField = "release_date";
@@ -42,20 +44,26 @@ namespace ErsatzTV.Infrastructure.Search
         private const string LanguageField = "language";
         private const string StyleField = "style";
         private const string MoodField = "mood";
+        private const string ActorField = "actor";
 
         private const string MovieType = "movie";
         private const string ShowType = "show";
         private const string ArtistType = "artist";
         private const string MusicVideoType = "music_video";
+        private readonly List<CultureInfo> _cultureInfos;
 
         private readonly ILogger<SearchIndex> _logger;
 
         private FSDirectory _directory;
         private IndexWriter _writer;
 
-        public SearchIndex(ILogger<SearchIndex> logger) => _logger = logger;
+        public SearchIndex(ILogger<SearchIndex> logger)
+        {
+            _logger = logger;
+            _cultureInfos = CultureInfo.GetCultures(CultureTypes.NeutralCultures).ToList();
+        }
 
-        public int Version => 6;
+        public int Version => 9;
 
         public Task<bool> Initialize(ILocalFileSystem localFileSystem)
         {
@@ -245,6 +253,7 @@ namespace ErsatzTV.Infrastructure.Search
                         new TextField(TitleField, metadata.Title, Field.Store.NO),
                         new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
                         new TextField(LibraryNameField, movie.LibraryPath.Library.Name, Field.Store.NO),
+                        new StringField(LibraryIdField, movie.LibraryPath.Library.Id.ToString(), Field.Store.NO),
                         new StringField(TitleAndYearField, GetTitleAndYear(metadata), Field.Store.NO),
                         new StringField(JumpLetterField, GetJumpLetter(metadata), Field.Store.YES)
                     };
@@ -280,6 +289,11 @@ namespace ErsatzTV.Infrastructure.Search
                         doc.Add(new TextField(StudioField, studio.Name, Field.Store.NO));
                     }
 
+                    foreach (Actor actor in metadata.Actors)
+                    {
+                        doc.Add(new TextField(ActorField, actor.Name, Field.Store.NO));
+                    }
+
                     _writer.UpdateDocument(new Term(IdField, movie.Id.ToString()), doc);
                 }
                 catch (Exception ex)
@@ -296,11 +310,17 @@ namespace ErsatzTV.Infrastructure.Search
             if (maybeVersion.IsSome)
             {
                 MediaVersion version = maybeVersion.ValueUnsafe();
-                foreach (string lang in version.Streams.Filter(ms => ms.MediaStreamKind == MediaStreamKind.Video)
+                foreach (CultureInfo cultureInfo in version.Streams
+                    .Filter(ms => ms.MediaStreamKind == MediaStreamKind.Audio)
                     .Map(ms => ms.Language).Distinct()
-                    .Filter(s => !string.IsNullOrWhiteSpace(s)))
+                    .Filter(s => !string.IsNullOrWhiteSpace(s))
+                    .Map(
+                        l => _cultureInfos.Filter(
+                            c => string.Equals(c.ThreeLetterISOLanguageName, l, StringComparison.OrdinalIgnoreCase)))
+                    .Sequence()
+                    .Flatten())
                 {
-                    doc.Add(new StringField(LanguageField, lang, Field.Store.NO));
+                    doc.Add(new TextField(LanguageField, cultureInfo.EnglishName, Field.Store.NO));
                 }
             }
         }
@@ -321,14 +341,25 @@ namespace ErsatzTV.Infrastructure.Search
                         new TextField(TitleField, metadata.Title, Field.Store.NO),
                         new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
                         new TextField(LibraryNameField, show.LibraryPath.Library.Name, Field.Store.NO),
+                        new StringField(LibraryIdField, show.LibraryPath.Library.Id.ToString(), Field.Store.NO),
                         new StringField(TitleAndYearField, GetTitleAndYear(metadata), Field.Store.NO),
                         new StringField(JumpLetterField, GetJumpLetter(metadata), Field.Store.YES)
                     };
 
                     List<string> languages = await searchRepository.GetLanguagesForShow(show);
-                    foreach (string lang in languages.Distinct().Filter(s => !string.IsNullOrWhiteSpace(s)))
+                    foreach (CultureInfo cultureInfo in languages
+                        .Distinct()
+                        .Filter(s => !string.IsNullOrWhiteSpace(s))
+                        .Map(
+                            l => _cultureInfos.Filter(
+                                c => string.Equals(
+                                    c.ThreeLetterISOLanguageName,
+                                    l,
+                                    StringComparison.OrdinalIgnoreCase)))
+                        .Sequence()
+                        .Flatten())
                     {
-                        doc.Add(new StringField(LanguageField, lang, Field.Store.NO));
+                        doc.Add(new TextField(LanguageField, cultureInfo.EnglishName, Field.Store.NO));
                     }
 
                     if (metadata.ReleaseDate.HasValue)
@@ -360,6 +391,11 @@ namespace ErsatzTV.Infrastructure.Search
                         doc.Add(new TextField(StudioField, studio.Name, Field.Store.NO));
                     }
 
+                    foreach (Actor actor in metadata.Actors)
+                    {
+                        doc.Add(new TextField(ActorField, actor.Name, Field.Store.NO));
+                    }
+
                     _writer.UpdateDocument(new Term(IdField, show.Id.ToString()), doc);
                 }
                 catch (Exception ex)
@@ -386,14 +422,25 @@ namespace ErsatzTV.Infrastructure.Search
                         new TextField(TitleField, metadata.Title, Field.Store.NO),
                         new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
                         new TextField(LibraryNameField, artist.LibraryPath.Library.Name, Field.Store.NO),
+                        new StringField(LibraryIdField, artist.LibraryPath.Library.Id.ToString(), Field.Store.NO),
                         new StringField(TitleAndYearField, GetTitleAndYear(metadata), Field.Store.NO),
                         new StringField(JumpLetterField, GetJumpLetter(metadata), Field.Store.YES)
                     };
 
                     List<string> languages = await searchRepository.GetLanguagesForArtist(artist);
-                    foreach (string lang in languages.Distinct().Filter(s => !string.IsNullOrWhiteSpace(s)))
+                    foreach (CultureInfo cultureInfo in languages
+                        .Distinct()
+                        .Filter(s => !string.IsNullOrWhiteSpace(s))
+                        .Map(
+                            l => _cultureInfos.Filter(
+                                c => string.Equals(
+                                    c.ThreeLetterISOLanguageName,
+                                    l,
+                                    StringComparison.OrdinalIgnoreCase)))
+                        .Sequence()
+                        .Flatten())
                     {
-                        doc.Add(new StringField(LanguageField, lang, Field.Store.NO));
+                        doc.Add(new TextField(LanguageField, cultureInfo.EnglishName, Field.Store.NO));
                     }
 
                     foreach (Genre genre in metadata.Genres)
@@ -416,7 +463,7 @@ namespace ErsatzTV.Infrastructure.Search
                 catch (Exception ex)
                 {
                     metadata.Artist = null;
-                    _logger.LogWarning(ex, "Error indexing show with metadata {@Metadata}", metadata);
+                    _logger.LogWarning(ex, "Error indexing artist with metadata {@Metadata}", metadata);
                 }
             }
         }
@@ -437,6 +484,7 @@ namespace ErsatzTV.Infrastructure.Search
                         new TextField(TitleField, metadata.Title, Field.Store.NO),
                         new StringField(SortTitleField, metadata.SortTitle.ToLowerInvariant(), Field.Store.NO),
                         new TextField(LibraryNameField, musicVideo.LibraryPath.Library.Name, Field.Store.NO),
+                        new StringField(LibraryIdField, musicVideo.LibraryPath.Library.Id.ToString(), Field.Store.NO),
                         new StringField(TitleAndYearField, GetTitleAndYear(metadata), Field.Store.NO),
                         new StringField(JumpLetterField, GetJumpLetter(metadata), Field.Store.YES)
                     };
@@ -500,7 +548,7 @@ namespace ErsatzTV.Infrastructure.Search
         }
 
         private static string GetTitleAndYear(Metadata metadata) =>
-            $"{metadata.Title}_{metadata.Year}";
+            $"{metadata.Title}_{metadata.Year}".ToLowerInvariant();
 
         private static string GetJumpLetter(Metadata metadata)
         {

ErsatzTV/ErsatzTV.csproj

@@ -19,7 +19,9 @@
       <PackageReference Include="Blazored.LocalStorage" Version="3.0.0" />
       <PackageReference Include="FluentValidation" Version="9.5.3" />
       <PackageReference Include="FluentValidation.AspNetCore" Version="9.5.3" />
+      <PackageReference Include="HtmlSanitizer" Version="5.0.376" />
       <PackageReference Include="LanguageExt.Core" Version="3.4.15" />
+      <PackageReference Include="Markdig" Version="0.24.0" />
       <PackageReference Include="MediatR.Courier.DependencyInjection" Version="3.0.1" />
       <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
       <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />

ErsatzTV/Pages/Artist.razor

@@ -5,6 +5,7 @@
 @using ErsatzTV.Application.MediaCards.Queries
 @using ErsatzTV.Application.MediaCollections
 @using ErsatzTV.Application.MediaCollections.Commands
+@using System.Globalization
 @using Unit = LanguageExt.Unit
 @inject IMediator Mediator
 @inject IDialogService Dialog
@@ -57,36 +58,58 @@
             </div>
         </div>
     </div>
-    @if (_artist.Genres.Any())
-    {
-        <MudText GutterBottom="true">Genres</MudText>
-        <div class="mb-2">
-            @foreach (string genre in _artist.Genres.OrderBy(g => g))
+    <MudCard Class="mb-6">
+        <MudCardContent>
+            @if (_sortedLanguages.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@genre" Class="mr-2 mb-2" Link="@($"/search?query=genre%3a%22{Uri.EscapeDataString(genre.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Languages:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=language%3a%22{Uri.EscapeDataString(_sortedLanguages.Head().EnglishName.ToLowerInvariant())}%22")">@_sortedLanguages.Head().EnglishName</MudLink>
+                    @foreach (CultureInfo language in _sortedLanguages.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=language%3a%22{Uri.EscapeDataString(language.EnglishName.ToLowerInvariant())}%22")">@language.EnglishName</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
-    @if (_artist.Styles.Any())
-    {
-        <MudText GutterBottom="true">Styles</MudText>
-        <div class="mb-2">
-            @foreach (string style in _artist.Styles.OrderBy(g => g))
+            @if (_sortedGenres.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@style" Class="mr-2 mb-2" Link="@($"/search?query=style%3a%22{Uri.EscapeDataString(style.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Genres:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=genre%3a%22{Uri.EscapeDataString(_sortedGenres.Head())}%22")">@_sortedGenres.Head()</MudLink>
+                    @foreach (string genre in _sortedGenres.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=genre%3a%22{Uri.EscapeDataString(genre)}%22")">@genre</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
-    @if (_artist.Moods.Any())
-    {
-        <MudText GutterBottom="true">Moods</MudText>
-        <div class="mb-2">
-            @foreach (string mood in _artist.Moods.OrderBy(g => g))
+            @if (_sortedStyles.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@mood" Class="mr-2 mb-2" Link="@($"/search?query=mood%3a%22{Uri.EscapeDataString(mood.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Styles:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=style%3a%22{Uri.EscapeDataString(_sortedStyles.Head())}%22")">@_sortedStyles.Head()</MudLink>
+                    @foreach (string style in _sortedStyles.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=style%3a%22{Uri.EscapeDataString(style)}%22")">@style</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
+            @if (_sortedMoods.Any())
+            {
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Moods:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=mood%3a%22{Uri.EscapeDataString(_sortedMoods.Head())}%22")">@_sortedMoods.Head()</MudLink>
+                    @foreach (string mood in _sortedMoods.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=mood%3a%22{Uri.EscapeDataString(mood)}%22")">@mood</MudLink>
+                    }
+                </div>
+            }
+        </MudCardContent>
+    </MudCard>
 </MudContainer>
 <MudContainer MaxWidth="MaxWidth.Large" Class="mt-8">
     @foreach (MusicVideoCardViewModel musicVideo in _musicVideos.Cards)
@@ -101,7 +124,7 @@
                 }
                 else
                 {
-                    <MudSkeleton SkeletonType="SkeletonType.Rectangle" Animation="Animation.False" Height="220px" Width="293px" />
+                    <MudSkeleton SkeletonType="SkeletonType.Rectangle" Animation="Animation.False" Height="220px" Width="293px"/>
                 }
                 <MudCardContent Class="ml-3">
                     <div style="display: flex; flex-direction: column; height: 100%">
@@ -128,13 +151,25 @@
     public int ArtistId { get; set; }
 
     private ArtistViewModel _artist;
+    private List<CultureInfo> _sortedLanguages = new();
+    private List<string> _sortedGenres = new();
+    private List<string> _sortedStyles = new();
+    private List<string> _sortedMoods = new();
     private MusicVideoCardResultsViewModel _musicVideos;
 
     protected override Task OnParametersSetAsync() => RefreshData();
 
     private async Task RefreshData()
     {
-        await Mediator.Send(new GetArtistById(ArtistId)).IfSomeAsync(vm => _artist = vm);
+        await Mediator.Send(new GetArtistById(ArtistId)).IfSomeAsync(vm =>
+        {
+            _artist = vm;
+            _sortedLanguages = _artist.Languages.OrderBy(ci => ci.EnglishName).ToList();
+            _sortedGenres = _artist.Genres.OrderBy(g => g).ToList();
+            _sortedStyles = _artist.Styles.OrderBy(s => s).ToList();
+            _sortedMoods = _artist.Moods.OrderBy(m => m).ToList();
+        });
+
         _musicVideos = await Mediator.Send(new GetMusicVideoCards(ArtistId, 1, 100));
     }
 
@@ -151,7 +186,7 @@
             NavigationManager.NavigateTo($"/media/collections/{collection.Id}");
         }
     }
-    
+
     private async Task AddMusicVideoToCollection(MusicVideoCardViewModel musicVideo)
     {
         var parameters = new DialogParameters { { "EntityType", "music video" }, { "EntityName", musicVideo.Title } };

ErsatzTV/Pages/ArtistList.razor

@@ -131,7 +131,10 @@
 
     private void SelectClicked(MediaCardViewModel card, MouseEventArgs e)
     {
-        List<MediaCardViewModel> GetSortedItems() => _data.Cards.OrderBy(m => m.SortTitle).ToList<MediaCardViewModel>();
+        List<MediaCardViewModel> GetSortedItems()
+        {
+            return _data.Cards.OrderBy(m => m.SortTitle).ToList<MediaCardViewModel>();
+        }
 
         SelectClicked(GetSortedItems, card, e);
     }

ErsatzTV/Pages/CollectionItems.razor

@@ -271,13 +271,16 @@
 
     private void SelectClicked(MediaCardViewModel card, MouseEventArgs e)
     {
-        List<MediaCardViewModel> GetSortedItems() => _data.MovieCards.OrderBy(m => m.SortTitle)
-            .Append<MediaCardViewModel>(_data.ShowCards.OrderBy(s => s.SortTitle))
-            .Append(_data.SeasonCards.OrderBy(s => s.SortTitle))
-            .Append(_data.EpisodeCards.OrderBy(ep => ep.Aired))
-            .Append(_data.ArtistCards.OrderBy(a => a.SortTitle))
-            .Append(_data.MusicVideoCards.OrderBy(mv => mv.SortTitle))
-            .ToList();
+        List<MediaCardViewModel> GetSortedItems()
+        {
+            return _data.MovieCards.OrderBy(m => m.SortTitle)
+                .Append<MediaCardViewModel>(_data.ShowCards.OrderBy(s => s.SortTitle))
+                .Append(_data.SeasonCards.OrderBy(s => s.SortTitle))
+                .Append(_data.EpisodeCards.OrderBy(ep => ep.Aired))
+                .Append(_data.ArtistCards.OrderBy(a => a.SortTitle))
+                .Append(_data.MusicVideoCards.OrderBy(mv => mv.SortTitle))
+                .ToList();
+        }
 
         SelectClicked(GetSortedItems, card, e);
     }

ErsatzTV/Pages/Collections.razor

@@ -1,20 +1,19 @@
 @page "/media/collections"
-@using Microsoft.Extensions.Caching.Memory
-@using Blazored.LocalStorage
 @using ErsatzTV.Application.MediaCollections
 @using ErsatzTV.Application.MediaCollections.Commands
 @using ErsatzTV.Application.MediaCollections.Queries
+@using ErsatzTV.Application.Configuration.Queries
 @using ErsatzTV.Application.MediaCards
+@using ErsatzTV.Application.Configuration.Commands
 @inject IDialogService Dialog
 @inject IMediator Mediator
-@inject IMemoryCache MemoryCache
-@inject ILocalStorageService LocalStorage
 
 <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
     <MudTable Hover="true"
+              @bind-RowsPerPage="@_rowsPerPage"
               ServerData="@(new Func<TableState, Task<TableData<MediaCollectionViewModel>>>(ServerReload))"
               Dense="true"
-              @ref="                    _table">
+              @ref="_table">
         <ToolBarContent>
             <MudText Typo="Typo.h6">Collections</MudText>
         </ToolBarContent>
@@ -55,12 +54,10 @@
 @code {
     private MudTable<MediaCollectionViewModel> _table;
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        int rowsPerPage = await LocalStorage.GetItemAsync<int?>("pages.collections.rows_per_page") ?? 10;
-        _table.RowsPerPage = rowsPerPage;
-        await _table.ReloadServerData();
-    }
+    private int _rowsPerPage;
+
+    protected override async Task OnParametersSetAsync() => _rowsPerPage = await Mediator.Send(new GetConfigElementByKey(ConfigElementKey.CollectionsPageSize))
+        .Map(maybeRows => maybeRows.Match(ce => int.TryParse(ce.Value, out int rows) ? rows : 10, () => 10));
 
     private async Task DeleteMediaCollection(MediaCardViewModel vm)
     {
@@ -82,7 +79,7 @@
 
     private async Task<TableData<MediaCollectionViewModel>> ServerReload(TableState state)
     {
-        await LocalStorage.SetItemAsync<int?>("pages.collections.rows_per_page", state.PageSize);
+        await Mediator.Send(new SaveConfigElementByKey(ConfigElementKey.CollectionsPageSize, state.PageSize.ToString()));
 
         PagedMediaCollectionsViewModel data = await Mediator.Send(new GetPagedCollections(state.Page, state.PageSize));
         return new TableData<MediaCollectionViewModel> { TotalItems = data.TotalCount, Items = data.Page };

ErsatzTV/Pages/Index.razor

@@ -1,72 +1,69 @@
 @page "/"
+@using Microsoft.Extensions.Caching.Memory
+@using System.Reflection
+@using ErsatzTV.Core.Interfaces.GitHub
+@inject IGitHubApiClient _gitHubApiClient
+@inject IMemoryCache _memoryCache
 
 <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
     <MudCard>
-        <MudCardContent>
-            <MudText Typo="Typo.h3">Welcome to ErsatzTV!</MudText>
-            <MudElement HtmlTag="div" Class="mt-6">
-                <MudText Typo="Typo.h4" GutterBottom="true">Channels</MudText>
-                <MudText>
-                    <MudLink Href="/channels">Channels</MudLink> are not directly associated with any media. Channels have a <b>number</b>, a <b>name</b>, and a <b>streaming mode</b> that indicates how the channel will play media.
-                </MudText>
-                <MudText Class="mt-3">
-                    In <b>TransportStream</b> mode, the channel will also require an <b>FFmpeg profile</b> to configure transcoding and normalization.
-                    In <b>HttpLiveStreaming</b> mode, the channel will attempt to serve the channel's media without transcoding or normalization beyond the container format.
-                </MudText>
-            </MudElement>
-            <MudElement HtmlTag="div" Class="mt-6">
-                <MudText Typo="Typo.h4" GutterBottom="true">FFmpeg Profiles</MudText>
-                <MudText>
-                    <MudLink Href="/ffmpeg">FFmpeg Profiles</MudLink> are collections of FFmpeg settings that are applied at the channel level.
-                    All content on a given channel will use the same FFmpeg settings. This also means the same content on different channels can use different settings.
-                </MudText>
-            </MudElement>
-            <MudElement HtmlTag="div" Class="mt-6">
-                <MudText Typo="Typo.h4" GutterBottom="true">Libraries</MudText>
-                <MudText>
-                    Two local <MudLink Href="/media/libraries">libraries</MudLink> are available, one for each <b>media kind</b>: Shows and Movies. Libraries contain <b>paths</b> (folders) to regularly scan for media items.
-                    Support for Plex libraries is under active development; Jellyfin and Emby library support is planned.
-                </MudText>
-            </MudElement>
-            <MudElement HtmlTag="div" Class="mt-6">
-                <MudText Typo="Typo.h4" GutterBottom="true">Collections</MudText>
-                <MudText>
-                    <MudLink Href="/media/collections">Collections</MudLink> have a <b>name</b> and contain a logical grouping of media items.
-                    Collections may contain shows, seasons, episodes or movies.
-                    Collections containing shows and seasons are automatically updated as media is added or removed from the linked shows and seasons.
-                </MudText>
-            </MudElement>
-            <MudElement HtmlTag="div" Class="mt-6">
-                <MudText Typo="Typo.h4" GutterBottom="true">Schedules</MudText>
-                <MudText>
-                    <MudLink Href="/schedules">Schedules</MudLink> have a <b>name</b>, a <b>collection playback order</b> and <b>items</b> to continually loop through.
-                </MudText>
-                <MudText Class="mt-3 mb-2">Three <b>collection playback orders</b> are supported:</MudText>
-                <ul class="mud-typography-body1">
-                    <li><b>Random</b> - to randomly play collection items; repeating is allowed before all collection items have been played.</li>
-                    <li><b>Shuffle</b> - to randomly play collection items; repeating is <i>not</i> allowed until all collection items have been played.</li>
-                    <li><b>Chronological</b> - to play collection items sorted by air date and then by season and episode number (for when multiple episodes aired on a single day).</li>
-                </ul>
-                <MudText Class="mt-3">
-                    Schedule items have a <b>start type</b>, a <b>start time</b>, a <b>collection</b> and a <b>playout mode</b>.
-                </MudText>
-                <MudText Class="mt-3">
-                    A <b>fixed</b> start type requires a <b>start time</b>, while a <b>dynamic</b> start type means the schedule item will start immediately after the preceding schedule item.
-                </MudText>
-                <MudText Class="mt-3 mb-2">Four <b>playout modes</b> are supported:</MudText>
-                <ul class="mud-typography-body1">
-                    <li><b>One</b> - to play one media item from the collection before advancing to the next schedule item.</li>
-                    <li><b>Multiple</b> - to play a specified <b>count</b> of media items from the collection before advancing to the next schedule item.</li>
-                    <li><b>Duration</b> - to play the maximum number of complete media items that will fit in the specified <b>playout duration</b>, before either going offline for the remainder of the <b>playout duration</b> (an <b>offline tail</b>), or immediately advancing to the next schedule item.</li>
-                    <li><b>Flood</b> - to play media items from the collection forever, or until the next schedule item's <b>start time</b> if one exists.</li>
-                </ul>
-            </MudElement>
-            <MudElement HtmlTag="div" Class="mt-6">
-                <MudText Typo="Typo.h4" GutterBottom="true">Playouts</MudText>
-                <MudText>
-                    <MudLink Href="/playouts">Playouts</MudLink> assign a <b>schedule</b> to a <b>channel</b> and individually track the ordered playback of collection items.
-                </MudText>
-            </MudElement>
+        <MudCardContent Class="release-notes mud-typography mud-typography-body1">
+            <MarkdownView Content="@_releaseNotes"/>
         </MudCardContent>
     </MudCard>
-</MudContainer>
+</MudContainer>
+
+@code {
+
+    private string _releaseNotes;
+
+    protected override async Task OnParametersSetAsync()
+    {
+        try
+        {
+            if (_memoryCache.TryGetValue("Index.ReleaseNotesHtml", out string releaseNotesHtml))
+            {
+                _releaseNotes = releaseNotesHtml;
+            }
+            else
+            {
+                var assembly = Assembly.GetEntryAssembly();
+                if (assembly != null)
+                {
+                    string version = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+                    if (version != null)
+                    {
+                        Either<BaseError, string> maybeNotes;
+
+                        if (version != "develop")
+                        {
+                            string gitHubVersion = version.Split("-").Head() + "-prealpha";
+                            if (!gitHubVersion.StartsWith("v"))
+                            {
+                                gitHubVersion = $"v{gitHubVersion}";
+                            }
+
+                            maybeNotes = await _gitHubApiClient.GetReleaseNotes(gitHubVersion);
+                            maybeNotes.IfRight(notes => _releaseNotes = notes);
+                        }
+                        else
+                        {
+                            maybeNotes = await _gitHubApiClient.GetLatestReleaseNotes();
+                            maybeNotes.IfRight(notes => _releaseNotes = notes);
+                        }
+                    }
+                }
+
+                if (_releaseNotes != null)
+                {
+                    _memoryCache.Set("Index.ReleaseNotesHtml", _releaseNotes);
+                }
+            }
+        }
+        catch (Exception)
+        {
+    // ignore
+        }
+    }
+
+}

ErsatzTV/Pages/Libraries.razor

@@ -22,7 +22,7 @@
             <col/>
             <col/>
             <col/>
-            <col style="width: 180px;"/>
+            <col style="width: 240px;"/>
         </ColGroup>
         <HeaderContent>
             <MudTh>Library Kind</MudTh>
@@ -60,6 +60,11 @@
                             </MudIconButton>
                         </MudTooltip>
                     }
+                    <MudTooltip Text="Search Library">
+                        <MudIconButton Icon="@Icons.Material.Filled.Search"
+                                       Link="@($"/search?query=library_id%3a{context.Id}")">
+                        </MudIconButton>
+                    </MudTooltip>
                     @if (context is LocalLibraryViewModel)
                     {
                         <MudTooltip Text="Edit Library">

ErsatzTV/Pages/Movie.razor

@@ -1,6 +1,8 @@
 @page "/media/movies/{MovieId:int}"
 @using ErsatzTV.Application.Movies
 @using ErsatzTV.Application.Movies.Queries
+@using System.Globalization
+@using ErsatzTV.Application.MediaCards
 @using ErsatzTV.Application.MediaCollections
 @using ErsatzTV.Application.MediaCollections.Commands
 @inject IMediator Mediator
@@ -43,37 +45,74 @@
             </div>
         </div>
     </div>
-    @if (_movie.Studios.Any())
-    {
-        <MudText GutterBottom="true">Studios</MudText>
-        <div class="mb-2">
-            @foreach (string studio in _movie.Studios.OrderBy(s => s))
+    <MudCard Class="mb-6">
+        <MudCardContent>
+            @if (_sortedLanguages.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@studio" Class="mr-2 mb-2" Link="@($"/search?query=studio%3a%22{Uri.EscapeDataString(studio.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Languages:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=language%3a%22{Uri.EscapeDataString(_sortedLanguages.Head().EnglishName.ToLowerInvariant())}%22")">@_sortedLanguages.Head().EnglishName</MudLink>
+                    @foreach (CultureInfo language in _sortedLanguages.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=language%3a%22{Uri.EscapeDataString(language.EnglishName.ToLowerInvariant())}%22")">@language.EnglishName</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
-    @if (_movie.Genres.Any())
-    {
-        <MudText GutterBottom="true">Genres</MudText>
-        <div class="mb-2">
-            @foreach (string genre in _movie.Genres.OrderBy(g => g))
+            @if (_sortedStudios.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@genre" Class="mr-2 mb-2" Link="@($"/search?query=genre%3a%22{Uri.EscapeDataString(genre.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Studios:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=studio%3a%22{Uri.EscapeDataString(_sortedStudios.Head())}%22")">@_sortedStudios.Head()</MudLink>
+                    @foreach (string studio in _sortedStudios.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=studio%3a%22{Uri.EscapeDataString(studio)}%22")">@studio</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
-    @if (_movie.Tags.Any())
-    {
-        <MudText GutterBottom="true">Tags</MudText>
-        <div>
-            @foreach (string tag in _movie.Tags.OrderBy(t => t))
+            @if (_sortedGenres.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@tag" Class="mr-2 mb-2" Link="@($"/search?query=tag%3a%22{Uri.EscapeDataString(tag.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Genres:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=genre%3a%22{Uri.EscapeDataString(_sortedGenres.Head())}%22")">@_sortedGenres.Head()</MudLink>
+                    @foreach (string genre in _sortedGenres.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=genre%3a%22{Uri.EscapeDataString(genre)}%22")">@genre</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
+            @if (_sortedTags.Any())
+            {
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Tags:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=tag%3a%22{Uri.EscapeDataString(_sortedTags.Head())}%22")">@_sortedTags.Head()</MudLink>
+                    @foreach (string tag in _sortedTags.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=tag%3a%22{Uri.EscapeDataString(tag)}%22")">@tag</MudLink>
+                    }
+                </div>
+            }
+        </MudCardContent>
+    </MudCard>
 </MudContainer>
+@if (_movie.Actors.Any())
+{
+    <MudContainer MaxWidth="MaxWidth.Large">
+        <MudText Class="mb-4">Actors</MudText>
+    </MudContainer>
+    <MudContainer MaxWidth="MaxWidth.Large" Class="media-card-grid">
+        @foreach (ActorCardViewModel actor in _movie.Actors)
+        {
+            <MediaCard Data="@actor"
+                       Link="@($"/search?query=actor%3a%22{Uri.EscapeDataString(actor.Name.ToLowerInvariant())}%22")"
+                       IsRemoteArtwork="true"
+                       ArtworkKind="ArtworkKind.Thumbnail"/>
+        }
+    </MudContainer>
+}
 
 @code {
 
@@ -81,11 +120,22 @@
     public int MovieId { get; set; }
 
     private MovieViewModel _movie;
+    private List<CultureInfo> _sortedLanguages = new();
+    private List<string> _sortedStudios = new();
+    private List<string> _sortedGenres = new();
+    private List<string> _sortedTags = new();
 
     protected override Task OnParametersSetAsync() => RefreshData();
 
     private Task RefreshData() =>
-        Mediator.Send(new GetMovieById(MovieId)).IfSomeAsync(vm => _movie = vm);
+        Mediator.Send(new GetMovieById(MovieId)).IfSomeAsync(vm =>
+        {
+            _movie = vm;
+            _sortedLanguages = _movie.Languages.OrderBy(ci => ci.EnglishName).ToList();
+            _sortedStudios = _movie.Studios.OrderBy(s => s).ToList();
+            _sortedGenres = _movie.Genres.OrderBy(g => g).ToList();
+            _sortedTags = _movie.Tags.OrderBy(t => t).ToList();
+        });
 
     private async Task AddToCollection()
     {

ErsatzTV/Pages/Search.razor

@@ -44,7 +44,7 @@
             {
                 <MudLink Class="ml-4" Href="@(NavigationManager.Uri.Split("#").Head() + "#shows")" Style="margin-bottom: auto; margin-top: auto">@_shows.Count Shows</MudLink>
             }
-            
+
             if (_artists.Count > 0)
             {
                 <MudLink Class="ml-4" Href="@(NavigationManager.Uri.Split("#").Head() + "#artists")" Style="margin-bottom: auto; margin-top: auto">@_artists.Count Artists</MudLink>
@@ -256,7 +256,7 @@
                     Right: _ => Snackbar.Add($"Added {show.Title} to collection {collection.Name}", Severity.Success));
             }
         }
-        
+
         if (card is ArtistCardViewModel artist)
         {
             var parameters = new DialogParameters { { "EntityType", "artist" }, { "EntityName", artist.Title } };
@@ -319,7 +319,7 @@
         }
         return uri;
     }
-    
+
     private string GetArtistsLink()
     {
         var uri = "/media/music/artists/page/1";

ErsatzTV/Pages/TelevisionSeasonList.razor

@@ -7,6 +7,7 @@
 @using ErsatzTV.Application.MediaCollections.Commands
 @using ErsatzTV.Application.ProgramSchedules
 @using ErsatzTV.Application.ProgramSchedules.Commands
+@using System.Globalization
 @using Unit = LanguageExt.Unit
 @inject IMediator Mediator
 @inject ILogger<TelevisionSeasonList> Logger
@@ -58,38 +59,63 @@
             </div>
         </div>
     </div>
-    @if (_show.Studios.Any())
-    {
-        <MudText GutterBottom="true">Studios</MudText>
-        <div class="mb-2">
-            @foreach (string studio in _show.Studios.OrderBy(g => g))
+    <MudCard Class="mb-6">
+        <MudCardContent>
+            @if (_sortedLanguages.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@studio" Class="mr-2 mb-2" Link="@($"/search?query=studio%3a%22{Uri.EscapeDataString(studio.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Languages:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=language%3a%22{Uri.EscapeDataString(_sortedLanguages.Head().EnglishName.ToLowerInvariant())}%22")">@_sortedLanguages.Head().EnglishName</MudLink>
+                    @foreach (CultureInfo language in _sortedLanguages.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=language%3a%22{Uri.EscapeDataString(language.EnglishName.ToLowerInvariant())}%22")">@language.EnglishName</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
-    @if (_show.Genres.Any())
-    {
-        <MudText GutterBottom="true">Genres</MudText>
-        <div class="mb-2">
-            @foreach (string genre in _show.Genres.OrderBy(g => g))
+            @if (_sortedStudios.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@genre" Class="mr-2 mb-2" Link="@($"/search?query=genre%3a%22{Uri.EscapeDataString(genre.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Studios:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=studio%3a%22{Uri.EscapeDataString(_sortedStudios.Head())}%22")">@_sortedStudios.Head()</MudLink>
+                    @foreach (string studio in _sortedStudios.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=studio%3a%22{Uri.EscapeDataString(studio)}%22")">@studio</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
-    @if (_show.Tags.Any())
-    {
-        <MudText GutterBottom="true">Tags</MudText>
-        <div>
-            @foreach (string tag in _show.Tags.OrderBy(t => t))
+            @if (_sortedGenres.Any())
             {
-                <MudFab Color="Color.Info" Size="Size.Small" Label="@tag" Class="mr-2 mb-2" Link="@($"/search?query=tag%3a%22{Uri.EscapeDataString(tag.ToLowerInvariant())}%22")"/>
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Genres:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=genre%3a%22{Uri.EscapeDataString(_sortedGenres.Head())}%22")">@_sortedGenres.Head()</MudLink>
+                    @foreach (string genre in _sortedGenres.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=genre%3a%22{Uri.EscapeDataString(genre)}%22")">@genre</MudLink>
+                    }
+                </div>
             }
-        </div>
-    }
+            @if (_sortedTags.Any())
+            {
+                <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+                    <MudText GutterBottom="true">Tags:&nbsp;</MudText>
+                    <MudLink Href="@($"/search?query=tag%3a%22{Uri.EscapeDataString(_sortedTags.Head())}%22")">@_sortedTags.Head()</MudLink>
+                    @foreach (string tag in _sortedTags.Skip(1))
+                    {
+                        <MudText>,&nbsp;</MudText>
+                        <MudLink Href="@($"/search?query=tag%3a%22{Uri.EscapeDataString(tag)}%22")">@tag</MudLink>
+                    }
+                </div>
+            }
+        </MudCardContent>
+    </MudCard>
 </MudContainer>
-<MudContainer MaxWidth="MaxWidth.Large" Class="media-card-grid mt-8">
+<MudContainer MaxWidth="MaxWidth.Large">
+    <MudText Class="mb-4">Seasons</MudText>
+</MudContainer>
+<MudContainer MaxWidth="MaxWidth.Large" Class="media-card-grid">
     @foreach (TelevisionSeasonCardViewModel card in _data.Cards)
     {
         <MediaCard Data="@card" Placeholder="@card.Placeholder"
@@ -97,6 +123,21 @@
                    AddToCollectionClicked="@AddSeasonToCollection"/>
     }
 </MudContainer>
+@if (_show.Actors.Any())
+{
+    <MudContainer MaxWidth="MaxWidth.Large">
+        <MudText Class="mb-4">Actors</MudText>
+    </MudContainer>
+    <MudContainer MaxWidth="MaxWidth.Large" Class="media-card-grid">
+        @foreach (ActorCardViewModel actor in _show.Actors)
+        {
+            <MediaCard Data="@actor"
+                       Link="@($"/search?query=actor%3a%22{Uri.EscapeDataString(actor.Name.ToLowerInvariant())}%22")"
+                       IsRemoteArtwork="true"
+                       ArtworkKind="ArtworkKind.Thumbnail"/>
+        }
+    </MudContainer>
+}
 
 @code {
 
@@ -104,6 +145,10 @@
     public int ShowId { get; set; }
 
     private TelevisionShowViewModel _show;
+    private List<CultureInfo> _sortedLanguages = new();
+    private List<string> _sortedStudios = new();
+    private List<string> _sortedGenres = new();
+    private List<string> _sortedTags = new();
 
     private int _pageSize => 100;
     private readonly int _pageNumber = 1;
@@ -115,7 +160,14 @@
     private async Task RefreshData()
     {
         await Mediator.Send(new GetTelevisionShowById(ShowId))
-            .IfSomeAsync(vm => _show = vm);
+            .IfSomeAsync(vm =>
+            {
+                _show = vm;
+                _sortedLanguages = _show.Languages.OrderBy(ci => ci.EnglishName).ToList();
+                _sortedStudios = _show.Studios.OrderBy(s => s).ToList();
+                _sortedGenres = _show.Genres.OrderBy(g => g).ToList();
+                _sortedTags = _show.Tags.OrderBy(t => t).ToList();
+            });
 
         _data = await Mediator.Send(new GetTelevisionSeasonCards(ShowId, _pageNumber, _pageSize));
     }

ErsatzTV/Pages/_Host.cshtml

@@ -43,6 +43,11 @@
         function enableSorting() {
             $("#sortable-collection").sortable("option", "disabled", false);
         }
+
+        function styleMarkdown() {
+            $("h2").addClass("mud-typography mud-typography-h4");
+            $("h3").addClass("mud-typography mud-typography-h5");
+        }
     </script>
 </head>
 <body>

ErsatzTV/Shared/AddToCollectionDialog.razor

@@ -9,33 +9,35 @@
 
 <MudDialog>
     <DialogContent>
-        <MudContainer Class="mb-6">
-            <MudHighlighter Class="mud-primary-text"
-                            Style="background-color: transparent; font-weight: bold"
-                            Text="@FormatText()"
-                            HighlightedText="@EntityName"/>
-        </MudContainer>
-        <MudSelect Label="Collection" @bind-Value="_selectedCollection" For="@(() => _selectedCollection)" Class="mb-6 mx-4">
-            @foreach (MediaCollectionViewModel collection in _collections)
-            {
-                <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
-            }
-        </MudSelect>
-        <MudTextFieldString Label="New Collection Name"
-                            Disabled="@(_selectedCollection != _newCollection)"
-                            @bind-Text="@_newCollectionName"
-                            Immediate="true"
-                            Class="mb-6 mx-4">
-        </MudTextFieldString>
+        <EditForm Model="@_dummyModel" OnSubmit="@(_ => Submit())">
+            <MudContainer Class="mb-6">
+                <MudHighlighter Class="mud-primary-text"
+                                Style="background-color: transparent; font-weight: bold"
+                                Text="@FormatText()"
+                                HighlightedText="@EntityName"/>
+            </MudContainer>
+            <MudSelect Label="Collection" @bind-Value="_selectedCollection" Class="mb-6 mx-4">
+                @foreach (MediaCollectionViewModel collection in _collections)
+                {
+                    <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                }
+            </MudSelect>
+            <MudTextFieldString Label="New Collection Name"
+                                Disabled="@(_selectedCollection != _newCollection)"
+                                @bind-Text="@_newCollectionName"
+                                Class="mb-6 mx-4">
+            </MudTextFieldString>
+        </EditForm>
     </DialogContent>
     <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton Color="Color.Primary" Variant="Variant.Filled" Disabled="@(!CanSubmit())" OnClick="Submit">
+        <MudButton OnClick="Cancel" ButtonType="ButtonType.Reset">Cancel</MudButton>
+        <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="Submit">
             Add To Collection
         </MudButton>
     </DialogActions>
 </MudDialog>
 
+
 @code {
 
     [CascadingParameter]
@@ -60,6 +62,10 @@
 
     private MediaCollectionViewModel _selectedCollection;
 
+    private record DummyModel;
+
+    private readonly DummyModel _dummyModel = new();
+
     private bool CanSubmit() =>
         _selectedCollection != null && (_selectedCollection != _newCollection || !string.IsNullOrWhiteSpace(_newCollectionName));
 
@@ -82,6 +88,11 @@
 
     private async Task Submit()
     {
+        if (!CanSubmit())
+        {
+            return;
+        }
+
         if (_selectedCollection == _newCollection)
         {
             Either<BaseError, MediaCollectionViewModel> maybeResult =
@@ -107,6 +118,17 @@
         }
     }
 
-    private void Cancel() => MudDialog.Cancel();
+    private async Task Cancel(MouseEventArgs e)
+    {
+    // this is gross, but [enter] seems to sometimes trigger cancel instead of submit
+        if (e.Detail == 0)
+        {
+            await Submit();
+        }
+        else
+        {
+            MudDialog.Cancel();
+        }
+    }
 
 }

ErsatzTV/Shared/AddToScheduleDialog.razor

@@ -2,28 +2,30 @@
 @using ErsatzTV.Application.ProgramSchedules.Queries
 @inject IMediator Mediator
 
-<MudDialog>
-    <DialogContent>
-        <MudContainer Class="mb-6">
-            <MudHighlighter Class="mud-primary-text"
-                            Style="background-color: transparent; font-weight: bold"
-                            Text="@FormatText()"
-                            HighlightedText="@EntityName"/>
-        </MudContainer>
-        <MudSelect Label="Schedule" @bind-Value="_selectedSchedule" For="@(() => _selectedSchedule)" Class="mb-6 mx-4">
-            @foreach (ProgramScheduleViewModel schedule in _schedules)
-            {
-                <MudSelectItem Value="@schedule">@schedule.Name</MudSelectItem>
-            }
-        </MudSelect>
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton Color="Color.Primary" Variant="Variant.Filled" Disabled="@(_selectedSchedule == null)" OnClick="Submit">
-            Add To Schedule
-        </MudButton>
-    </DialogActions>
-</MudDialog>
+<div @onkeydown="@OnKeyDown">
+    <MudDialog>
+        <DialogContent>
+            <MudContainer Class="mb-6">
+                <MudHighlighter Class="mud-primary-text"
+                                Style="background-color: transparent; font-weight: bold"
+                                Text="@FormatText()"
+                                HighlightedText="@EntityName"/>
+            </MudContainer>
+            <MudSelect Label="Schedule" @bind-Value="_selectedSchedule" For="@(() => _selectedSchedule)" Class="mb-6 mx-4">
+                @foreach (ProgramScheduleViewModel schedule in _schedules)
+                {
+                    <MudSelectItem Value="@schedule">@schedule.Name</MudSelectItem>
+                }
+            </MudSelect>
+        </DialogContent>
+        <DialogActions>
+            <MudButton OnClick="Cancel">Cancel</MudButton>
+            <MudButton Color="Color.Primary" Variant="Variant.Filled" Disabled="@(_selectedSchedule == null)" OnClick="Submit">
+                Add To Schedule
+            </MudButton>
+        </DialogActions>
+    </MudDialog>
+</div>
 
 @code {
 
@@ -55,4 +57,12 @@
 
     private void Cancel() => MudDialog.Cancel();
 
+    private void OnKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Code is "Enter" or "NumpadEnter")
+        {
+            Submit();
+        }
+    }
+
 }

ErsatzTV/Shared/DeleteDialog.razor

@@ -1,26 +1,28 @@
-<MudDialog>
-    <DialogContent>
-        <MudContainer>
-            <MudHighlighter Class="mud-primary-text"
-                            Style="background-color: transparent; font-weight: bold"
-                            Text="@FormatText()"
-                            HighlightedText="@EntityName"/>
-        </MudContainer>
-        @if (!string.IsNullOrWhiteSpace(DetailText))
-        {
-            <MudContainer Class="mt-3">
+<div @onkeydown="@OnKeyDown">
+    <MudDialog>
+        <DialogContent>
+            <MudContainer>
                 <MudHighlighter Class="mud-primary-text"
                                 Style="background-color: transparent; font-weight: bold"
-                                Text="@DetailText"
-                                HighlightedText="@DetailHighlight"/>
+                                Text="@FormatText()"
+                                HighlightedText="@EntityName"/>
             </MudContainer>
-        }
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="Submit">Delete</MudButton>
-    </DialogActions>
-</MudDialog>
+            @if (!string.IsNullOrWhiteSpace(DetailText))
+            {
+                <MudContainer Class="mt-3">
+                    <MudHighlighter Class="mud-primary-text"
+                                    Style="background-color: transparent; font-weight: bold"
+                                    Text="@DetailText"
+                                    HighlightedText="@DetailHighlight"/>
+                </MudContainer>
+            }
+        </DialogContent>
+        <DialogActions>
+            <MudButton OnClick="Cancel">Cancel</MudButton>
+            <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="Submit">Delete</MudButton>
+        </DialogActions>
+    </MudDialog>
+</div>
 
 @code {
 
@@ -45,4 +47,12 @@
 
     private void Cancel() => MudDialog.Cancel();
 
+    private void OnKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Code is "Enter" or "NumpadEnter")
+        {
+            Submit();
+        }
+    }
+
 }

ErsatzTV/Shared/MainLayout.razor

@@ -10,21 +10,21 @@
 <MudSnackbarProvider/>
 
 <MudLayout>
-    <MudAppBar Elevation="1">
+    <MudAppBar Elevation="1" Class="app-bar">
         <div style="min-width: 240px">
             <a href="/">
                 <img src="/images/ersatztv.png" alt="ErsatzTV"/>
             </a>
         </div>
-        <MudTextField T="string"
-                      @bind-Value="@_query"
-                      AdornmentIcon="@Icons.Material.Filled.Search"
-                      Adornment="Adornment.Start"
-                      Variant="Variant.Outlined"
-                      Class="search-bar"
-                      OnKeyDown="@OnSearchKeyDown"
-                      Immediate="true">
-        </MudTextField>
+        <EditForm Model="@_dummyModel" OnSubmit="@(_ => PerformSearch())">
+            <MudTextField T="string"
+                          @bind-Value="@_query"
+                          AdornmentIcon="@Icons.Material.Filled.Search"
+                          Adornment="Adornment.Start"
+                          Variant="Variant.Outlined"
+                          Class="search-bar">
+            </MudTextField>
+        </EditForm>
         <MudAppBarSpacer/>
         <MudLink Color="Color.Info" Href="/iptv/channels.m3u" Target="_blank" Underline="Underline.None">M3U</MudLink>
         <MudLink Color="Color.Info" Href="/iptv/xmltv.xml" Target="_blank" Class="mx-4" Underline="Underline.None">XMLTV</MudLink>
@@ -74,6 +74,10 @@
 
     private string _query;
 
+    private record SearchModel;
+
+    private readonly SearchModel _dummyModel = new();
+
     private MudTheme _ersatzTvTheme => new()
     {
         Palette = new Palette
@@ -122,4 +126,11 @@
         }
     }
 
+    private void PerformSearch()
+    {
+        string query = HttpUtility.UrlEncode(_query);
+        NavigationManager.NavigateTo($"/search?query={query}", true);
+        StateHasChanged();
+    }
+
 }

ErsatzTV/Shared/MarkdownView.razor

@@ -0,0 +1 @@
+@HtmlContent

ErsatzTV/Shared/MarkdownView.razor.cs

@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using Ganss.XSS;
+using Markdig;
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+
+namespace ErsatzTV.Shared
+{
+    public partial class MarkdownView
+    {
+        private string _content;
+
+        [Inject]
+        public IHtmlSanitizer HtmlSanitizer { get; set; }
+
+        [Inject]
+        public IJSRuntime JsRuntime { get; set; }
+
+        [Parameter]
+        public string Content
+        {
+            get => _content;
+            set
+            {
+                _content = value;
+                HtmlContent = ConvertStringToMarkupString(_content);
+            }
+        }
+
+        public MarkupString HtmlContent { get; private set; }
+
+        private MarkupString ConvertStringToMarkupString(string value)
+        {
+            if (!string.IsNullOrWhiteSpace(_content))
+            {
+                // Convert markdown string to HTML
+                string html = Markdown.ToHtml(value, new MarkdownPipelineBuilder().UseAdvancedExtensions().Build());
+
+                // Sanitize HTML before rendering
+                string sanitizedHtml = HtmlSanitizer.Sanitize(html);
+
+                // Return sanitized HTML as a MarkupString that Blazor can render
+                return new MarkupString(sanitizedHtml);
+            }
+
+            return new MarkupString();
+        }
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            await JsRuntime.InvokeVoidAsync("styleMarkdown");
+            await base.OnAfterRenderAsync(firstRender);
+        }
+    }
+}

ErsatzTV/Shared/MediaCard.razor

@@ -119,6 +119,9 @@
     [Parameter]
     public Color SelectColor { get; set; } = Color.Tertiary;
 
+    [Parameter]
+    public bool IsRemoteArtwork { get; set; }
+
     private string GetPlaceholder(string sortTitle)
     {
         if (Placeholder != null)
@@ -130,9 +133,17 @@
         return char.IsDigit(first) || !char.IsLetter(first) ? "#" : first.ToString();
     }
 
-    private string ArtworkForItem() => string.IsNullOrWhiteSpace(Data.Poster)
-        ? "position: relative"
-        : $"position: relative; background-image: url(/artwork/{PathForArtwork()}/{Data.Poster}); background-size: cover; background-position: center";
+    private string ArtworkForItem()
+    {
+        if (IsRemoteArtwork)
+        {
+            return $"position: relative; background-image: url({Data.Poster}); background-size: cover; background-position: center";
+        }
+
+        return string.IsNullOrWhiteSpace(Data.Poster)
+            ? "position: relative"
+            : $"position: relative; background-image: url(/artwork/{PathForArtwork()}/{Data.Poster}); background-size: cover; background-position: center";
+    }
 
     private string PathForArtwork() => ArtworkKind switch
     {

ErsatzTV/Shared/RemoveFromCollectionDialog.razor

@@ -1,21 +1,23 @@
 @inject IMediator Mediator
 
-<MudDialog>
-    <DialogContent>
-        <MudContainer Class="mb-6">
-            <MudHighlighter Class="mud-primary-text"
-                            Style="background-color: transparent; font-weight: bold"
-                            Text="@FormatText()"
-                            HighlightedText="@EntityName"/>
-        </MudContainer>
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="Submit">
-            Remove From Collection
-        </MudButton>
-    </DialogActions>
-</MudDialog>
+<div @onkeydown="@OnKeyDown">
+    <MudDialog>
+        <DialogContent>
+            <MudContainer Class="mb-6">
+                <MudHighlighter Class="mud-primary-text"
+                                Style="background-color: transparent; font-weight: bold"
+                                Text="@FormatText()"
+                                HighlightedText="@EntityName"/>
+            </MudContainer>
+        </DialogContent>
+        <DialogActions>
+            <MudButton OnClick="Cancel">Cancel</MudButton>
+            <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="Submit">
+                Remove From Collection
+            </MudButton>
+        </DialogActions>
+    </MudDialog>
+</div>
 
 @code {
 
@@ -40,4 +42,12 @@
 
     private void Cancel() => MudDialog.Cancel();
 
+    private void OnKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Code is "Enter" or "NumpadEnter")
+        {
+            Submit();
+        }
+    }
+
 }

ErsatzTV/Shared/SignOutOfPlexDialog.razor

@@ -1,16 +1,18 @@
-<MudDialog>
-    <DialogContent>
-        <MudContainer>
-            <MudHighlighter Class="mud-primary-text"
-                            Style="background-color: transparent; font-weight: bold"
-                            Text="Do you really want to sign out of Plex? All synchronized content will be removed."/>
-        </MudContainer>
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="Submit">Sign out</MudButton>
-    </DialogActions>
-</MudDialog>
+<div @onkeydown="@OnKeyDown">
+    <MudDialog>
+        <DialogContent>
+            <MudContainer>
+                <MudHighlighter Class="mud-primary-text"
+                                Style="background-color: transparent; font-weight: bold"
+                                Text="Do you really want to sign out of Plex? All synchronized content will be removed."/>
+            </MudContainer>
+        </DialogContent>
+        <DialogActions>
+            <MudButton OnClick="Cancel">Cancel</MudButton>
+            <MudButton Color="Color.Error" Variant="Variant.Filled" OnClick="Submit">Sign out</MudButton>
+        </DialogActions>
+    </MudDialog>
+</div>
 
 @code {
 
@@ -21,4 +23,12 @@
 
     private void Cancel() => MudDialog.Cancel();
 
+    private void OnKeyDown(KeyboardEventArgs e)
+    {
+        if (e.Code is "Enter" or "NumpadEnter")
+        {
+            Submit();
+        }
+    }
+
 }

ErsatzTV/Startup.cs

@@ -10,6 +10,7 @@ using ErsatzTV.Application.Channels.Queries;
 using ErsatzTV.Core;
 using ErsatzTV.Core.FFmpeg;
 using ErsatzTV.Core.Interfaces.FFmpeg;
+using ErsatzTV.Core.Interfaces.GitHub;
 using ErsatzTV.Core.Interfaces.Images;
 using ErsatzTV.Core.Interfaces.Locking;
 using ErsatzTV.Core.Interfaces.Metadata;
@@ -24,6 +25,7 @@ using ErsatzTV.Core.Scheduling;
 using ErsatzTV.Formatters;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Data.Repositories;
+using ErsatzTV.Infrastructure.GitHub;
 using ErsatzTV.Infrastructure.Images;
 using ErsatzTV.Infrastructure.Locking;
 using ErsatzTV.Infrastructure.Plex;
@@ -33,6 +35,7 @@ using ErsatzTV.Serialization;
 using ErsatzTV.Services;
 using ErsatzTV.Services.RunOnce;
 using FluentValidation.AspNetCore;
+using Ganss.XSS;
 using MediatR;
 using MediatR.Courier.DependencyInjection;
 using Microsoft.AspNetCore.Builder;
@@ -225,6 +228,14 @@ namespace ErsatzTV
             services.AddScoped<IPlexPathReplacementService, PlexPathReplacementService>();
             services.AddScoped<IFFmpegStreamSelector, FFmpegStreamSelector>();
             services.AddScoped<FFmpegProcessService>();
+            services.AddScoped<IGitHubApiClient, GitHubApiClient>();
+            services.AddScoped<IHtmlSanitizer, HtmlSanitizer>(
+                _ =>
+                {
+                    var sanitizer = new HtmlSanitizer();
+                    sanitizer.AllowedAttributes.Add("class");
+                    return sanitizer;
+                });
 
             services.AddHostedService<DatabaseMigratorService>();
             services.AddHostedService<CacheCleanerService>();

ErsatzTV/wwwroot/css/site.css

@@ -74,6 +74,8 @@
     border-radius: 4px;
 }
 
+.app-bar form { flex-grow: 1; }
+
 .fanart-container {
     position: relative;
     width: 100%;
@@ -120,4 +122,12 @@
     flex-direction: column;
     height: 100%;
     justify-content: space-around;
-}
+}
+
+.release-notes ul { list-style: unset; }
+
+.release-notes > ul { margin-top: 10px; }
+
+.release-notes ul > li { margin-left: 30px; }
+
+.release-notes h3 { margin-top: 20px; }

README.md

@@ -23,16 +23,6 @@ Want to join the community or have a question? Join us on [Discord](https://disc
 - Run as a Windows service
 - Spots to fill unscheduled gaps
 
-## Screenshots
-
-### Television Show
-
-![Television Show](docs/images/television-show.png)
-
-### Media Collection
-
-![Media Collection](docs/images/media-collection.png)
-
 ## License
 
 This project is inspired by [pseudotv-plex](https://github.com/DEFENDORe/pseudotv) and