From 9afec1988848aab47c6794d4cbd4f59811627a82 Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Sun, 23 May 2021 03:27:20 -0500 Subject: [PATCH] cleanup --- .../TelevisionEpisodeCardViewModel.cs | 4 +- .../TelevisionSeasonCardViewModel.cs | 4 +- .../MediaCards/TelevisionShowCardViewModel.cs | 4 +- ErsatzTV/Pages/Artist.razor | 30 ++++++------ ErsatzTV/Pages/ArtistList.razor | 10 ++-- ErsatzTV/Pages/ChannelEditor.razor | 36 +++++++-------- ErsatzTV/Pages/Channels.razor | 12 ++--- ErsatzTV/Pages/CollectionEditor.razor | 20 ++++---- ErsatzTV/Pages/CollectionItems.razor | 26 +++++------ ErsatzTV/Pages/Collections.razor | 14 +++--- ErsatzTV/Pages/FFmpegEditor.razor | 26 +++++------ ErsatzTV/Pages/Libraries.razor | 40 ++++++++-------- ErsatzTV/Pages/LocalLibraryEditor.razor | 12 ++--- ErsatzTV/Pages/LocalLibraryPathEditor.razor | 28 +++++------ ErsatzTV/Pages/Logs.razor | 4 +- ErsatzTV/Pages/Movie.razor | 14 +++--- ErsatzTV/Pages/MovieList.razor | 10 ++-- ErsatzTV/Pages/MusicVideoList.razor | 10 ++-- ErsatzTV/Pages/PlayoutEditor.razor | 20 ++++---- ErsatzTV/Pages/Playouts.razor | 14 +++--- ErsatzTV/Pages/PlexMediaSources.razor | 46 +++++++++---------- ErsatzTV/Pages/ScheduleEditor.razor | 22 ++++----- ErsatzTV/Pages/ScheduleItemsEditor.razor | 26 +++++------ ErsatzTV/Pages/Schedules.razor | 12 ++--- ErsatzTV/Pages/Search.razor | 14 +++--- ErsatzTV/Pages/TelevisionEpisodeList.razor | 42 ++++++++--------- ErsatzTV/Pages/TelevisionSeasonList.razor | 38 +++++++-------- ErsatzTV/Pages/TelevisionShowList.razor | 10 ++-- ErsatzTV/Shared/AddToCollectionDialog.razor | 22 ++++----- ErsatzTV/Shared/AddToScheduleDialog.razor | 4 +- ErsatzTV/Shared/MainLayout.razor | 16 ++----- ErsatzTV/Shared/MediaCard.razor | 2 +- ErsatzTV/Shared/RemoteMediaSourceEditor.razor | 2 - .../Shared/RemoveFromCollectionDialog.razor | 2 +- 34 files changed, 289 insertions(+), 307 deletions(-) diff --git a/ErsatzTV.Application/MediaCards/TelevisionEpisodeCardViewModel.cs b/ErsatzTV.Application/MediaCards/TelevisionEpisodeCardViewModel.cs index db19daf66..2693c3c45 100644 --- a/ErsatzTV.Application/MediaCards/TelevisionEpisodeCardViewModel.cs +++ b/ErsatzTV.Application/MediaCards/TelevisionEpisodeCardViewModel.cs @@ -17,7 +17,5 @@ namespace ErsatzTV.Application.MediaCards Title, $"Episode {Episode}", $"Episode {Episode}", - Poster) - { - } + Poster); } diff --git a/ErsatzTV.Application/MediaCards/TelevisionSeasonCardViewModel.cs b/ErsatzTV.Application/MediaCards/TelevisionSeasonCardViewModel.cs index a2a2d286f..e408279fa 100644 --- a/ErsatzTV.Application/MediaCards/TelevisionSeasonCardViewModel.cs +++ b/ErsatzTV.Application/MediaCards/TelevisionSeasonCardViewModel.cs @@ -14,7 +14,5 @@ Title, Subtitle, SortTitle, - Poster) - { - } + Poster); } diff --git a/ErsatzTV.Application/MediaCards/TelevisionShowCardViewModel.cs b/ErsatzTV.Application/MediaCards/TelevisionShowCardViewModel.cs index b43a441c8..1abb34cf5 100644 --- a/ErsatzTV.Application/MediaCards/TelevisionShowCardViewModel.cs +++ b/ErsatzTV.Application/MediaCards/TelevisionShowCardViewModel.cs @@ -6,7 +6,5 @@ Title, Subtitle, SortTitle, - Poster) - { - } + Poster); } diff --git a/ErsatzTV/Pages/Artist.razor b/ErsatzTV/Pages/Artist.razor index c829f942c..1b8fff2f5 100644 --- a/ErsatzTV/Pages/Artist.razor +++ b/ErsatzTV/Pages/Artist.razor @@ -7,11 +7,11 @@ @using ErsatzTV.Application.MediaCollections.Commands @using System.Globalization @using Unit = LanguageExt.Unit -@inject IMediator Mediator -@inject IDialogService Dialog -@inject NavigationManager NavigationManager -@inject ILogger Logger -@inject ISnackbar Snackbar +@inject IMediator _mediator +@inject IDialogService _dialog +@inject NavigationManager _navigationManager +@inject ILogger _logger +@inject ISnackbar _snackbar
@@ -161,7 +161,7 @@ private async Task RefreshData() { - await Mediator.Send(new GetArtistById(ArtistId)).IfSomeAsync(vm => + await _mediator.Send(new GetArtistById(ArtistId)).IfSomeAsync(vm => { _artist = vm; _sortedLanguages = _artist.Languages.OrderBy(ci => ci.EnglishName).ToList(); @@ -170,7 +170,7 @@ _sortedMoods = _artist.Moods.OrderBy(m => m).ToList(); }); - _musicVideos = await Mediator.Send(new GetMusicVideoCards(ArtistId, 1, 100)); + _musicVideos = await _mediator.Send(new GetMusicVideoCards(ArtistId, 1, 100)); } private async Task AddToCollection() @@ -178,12 +178,12 @@ var parameters = new DialogParameters { { "EntityType", "artist" }, { "EntityName", _artist.Name } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) { - await Mediator.Send(new AddArtistToCollection(collection.Id, ArtistId)); - NavigationManager.NavigateTo($"/media/collections/{collection.Id}"); + await _mediator.Send(new AddArtistToCollection(collection.Id, ArtistId)); + _navigationManager.NavigateTo($"/media/collections/{collection.Id}"); } } @@ -192,19 +192,19 @@ var parameters = new DialogParameters { { "EntityType", "music video" }, { "EntityName", musicVideo.Title } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) { var request = new AddMusicVideoToCollection(collection.Id, musicVideo.MusicVideoId); - Either addResult = await Mediator.Send(request); + Either addResult = await _mediator.Send(request); addResult.Match( Left: error => { - Snackbar.Add($"Unexpected error adding music video to collection: {error.Value}"); - Logger.LogError("Unexpected error adding music video to collection: {Error}", error.Value); + _snackbar.Add($"Unexpected error adding music video to collection: {error.Value}"); + _logger.LogError("Unexpected error adding music video to collection: {Error}", error.Value); }, - Right: _ => Snackbar.Add($"Added {musicVideo.Title} to collection {collection.Name}", Severity.Success)); + Right: _ => _snackbar.Add($"Added {musicVideo.Title} to collection {collection.Name}", Severity.Success)); } } diff --git a/ErsatzTV/Pages/ArtistList.razor b/ErsatzTV/Pages/ArtistList.razor index a95b6d593..ed8909923 100644 --- a/ErsatzTV/Pages/ArtistList.razor +++ b/ErsatzTV/Pages/ArtistList.razor @@ -9,8 +9,8 @@ @using ErsatzTV.Application.Search.Queries @using Unit = LanguageExt.Unit @inherits MultiSelectBase -@inject NavigationManager NavigationManager -@inject ChannelWriter Channel +@inject NavigationManager _navigationManager +@inject ChannelWriter _channel
@@ -90,7 +90,7 @@ PageNumber = 1; } - string query = new Uri(NavigationManager.Uri).Query; + string query = new Uri(_navigationManager.Uri).Query; if (QueryHelpers.ParseQuery(query).TryGetValue("query", out StringValues value)) { _query = value; @@ -116,7 +116,7 @@ { uri = QueryHelpers.AddQueryString(uri, "query", _query); } - NavigationManager.NavigateTo(uri); + _navigationManager.NavigateTo(uri); } private void NextPage() @@ -126,7 +126,7 @@ { uri = QueryHelpers.AddQueryString(uri, "query", _query); } - NavigationManager.NavigateTo(uri); + _navigationManager.NavigateTo(uri); } private void SelectClicked(MediaCardViewModel card, MouseEventArgs e) diff --git a/ErsatzTV/Pages/ChannelEditor.razor b/ErsatzTV/Pages/ChannelEditor.razor index 4e079ac6a..095358652 100644 --- a/ErsatzTV/Pages/ChannelEditor.razor +++ b/ErsatzTV/Pages/ChannelEditor.razor @@ -8,10 +8,10 @@ @using System.Globalization @using ErsatzTV.Application.Channels @using ErsatzTV.Application.Channels.Queries -@inject NavigationManager NavigationManager -@inject ILogger Logger -@inject ISnackbar Snackbar -@inject IMediator Mediator +@inject NavigationManager _navigationManager +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IMediator _mediator
@@ -87,11 +87,11 @@ protected override async Task OnParametersSetAsync() { await LoadFFmpegProfilesAsync(); - _availableCultures = await Mediator.Send(new GetAllLanguageCodes()); + _availableCultures = await _mediator.Send(new GetAllLanguageCodes()); if (Id.HasValue) { - Option maybeChannel = await Mediator.Send(new GetChannelById(Id.Value)); + Option maybeChannel = await _mediator.Send(new GetChannelById(Id.Value)); maybeChannel.Match( channelViewModel => { @@ -103,14 +103,14 @@ _model.StreamingMode = channelViewModel.StreamingMode; _model.PreferredLanguageCode = channelViewModel.PreferredLanguageCode; }, - () => NavigationManager.NavigateTo("404")); + () => _navigationManager.NavigateTo("404")); } else { - FFmpegSettingsViewModel ffmpegSettings = await Mediator.Send(new GetFFmpegSettings()); + FFmpegSettingsViewModel ffmpegSettings = await _mediator.Send(new GetFFmpegSettings()); // TODO: command for new channel - IEnumerable channelNumbers = await Mediator.Send(new GetAllChannels()) + IEnumerable channelNumbers = await _mediator.Send(new GetAllChannels()) .Map(list => list.Map(c => int.TryParse(c.Number.Split(".").Head(), out int result) ? result : 0)); int maxNumber = Optional(channelNumbers).Flatten().DefaultIfEmpty(0).Max(); _model.Number = (maxNumber + 1).ToString(); @@ -129,7 +129,7 @@ private bool IsEdit => Id.HasValue; private async Task LoadFFmpegProfilesAsync() => - _ffmpegProfiles = await Mediator.Send(new GetAllFFmpegProfiles()); + _ffmpegProfiles = await _mediator.Send(new GetAllFFmpegProfiles()); private async Task HandleSubmitAsync() { @@ -137,16 +137,16 @@ if (_editContext.Validate()) { Seq errorMessage = IsEdit ? - (await Mediator.Send(_model.ToUpdate())).LeftToSeq() : - (await Mediator.Send(_model.ToCreate())).LeftToSeq(); + (await _mediator.Send(_model.ToUpdate())).LeftToSeq() : + (await _mediator.Send(_model.ToCreate())).LeftToSeq(); errorMessage.HeadOrNone().Match( error => { - Snackbar.Add(error.Value, Severity.Error); - Logger.LogError("Unexpected error saving channel: {Error}", error.Value); + _snackbar.Add(error.Value, Severity.Error); + _logger.LogError("Unexpected error saving channel: {Error}", error.Value); }, - () => NavigationManager.NavigateTo("/channels")); + () => _navigationManager.NavigateTo("/channels")); } } @@ -154,7 +154,7 @@ { var buffer = new byte[e.File.Size]; await e.File.OpenReadStream().ReadAsync(buffer); - Either maybeCacheFileName = await Mediator.Send(new SaveArtworkToDisk(buffer, ArtworkKind.Logo)); + Either maybeCacheFileName = await _mediator.Send(new SaveArtworkToDisk(buffer, ArtworkKind.Logo)); maybeCacheFileName.Match( relativeFileName => { @@ -163,8 +163,8 @@ }, error => { - Snackbar.Add($"Unexpected error saving channel logo: {error.Value}", Severity.Error); - Logger.LogError("Unexpected error saving channel logo: {Error}", error.Value); + _snackbar.Add($"Unexpected error saving channel logo: {error.Value}", Severity.Error); + _logger.LogError("Unexpected error saving channel logo: {Error}", error.Value); }); } diff --git a/ErsatzTV/Pages/Channels.razor b/ErsatzTV/Pages/Channels.razor index a637d3ce1..2f6ef42db 100644 --- a/ErsatzTV/Pages/Channels.razor +++ b/ErsatzTV/Pages/Channels.razor @@ -5,8 +5,8 @@ @using ErsatzTV.Application.FFmpegProfiles @using ErsatzTV.Application.FFmpegProfiles.Queries @using System.Globalization -@inject IDialogService Dialog -@inject IMediator Mediator +@inject IDialogService _dialog +@inject IMediator _mediator @@ -82,7 +82,7 @@ protected override async Task OnParametersSetAsync() { - _ffmpegProfiles = await Mediator.Send(new GetAllFFmpegProfiles()); + _ffmpegProfiles = await _mediator.Send(new GetAllFFmpegProfiles()); await LoadChannelsAsync(); } @@ -91,18 +91,18 @@ var parameters = new DialogParameters { { "EntityType", "channel" }, { "EntityName", channel.Name } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Delete Channel", parameters, options); + IDialogReference dialog = _dialog.Show("Delete Channel", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled) { - await Mediator.Send(new DeleteChannel(channel.Id)); + await _mediator.Send(new DeleteChannel(channel.Id)); await LoadChannelsAsync(); } } private async Task LoadChannelsAsync() { - List channels = await Mediator.Send(new GetAllChannels()); + List channels = await _mediator.Send(new GetAllChannels()); IOrderedEnumerable sorted = channels.OrderBy(c => decimal.Parse(c.Number)); CultureInfo[] allCultures = CultureInfo.GetCultures(CultureTypes.NeutralCultures); diff --git a/ErsatzTV/Pages/CollectionEditor.razor b/ErsatzTV/Pages/CollectionEditor.razor index 9c9c6784b..5c071a40c 100644 --- a/ErsatzTV/Pages/CollectionEditor.razor +++ b/ErsatzTV/Pages/CollectionEditor.razor @@ -3,10 +3,10 @@ @using ErsatzTV.Application.MediaCollections @using ErsatzTV.Application.MediaCollections.Commands @using ErsatzTV.Application.MediaCollections.Queries -@inject NavigationManager NavigationManager -@inject ILogger Logger -@inject ISnackbar Snackbar -@inject IMediator Mediator +@inject NavigationManager _navigationManager +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IMediator _mediator
@@ -41,7 +41,7 @@ { if (IsEdit) { - Option maybeCollection = await Mediator.Send(new GetCollectionById(Id)); + Option maybeCollection = await _mediator.Send(new GetCollectionById(Id)); maybeCollection.IfSome(collection => { _model.Id = collection.Id; @@ -68,16 +68,16 @@ if (_editContext.Validate()) { Seq errorMessage = IsEdit ? - (await Mediator.Send(new UpdateCollection(Id, _model.Name))).LeftToSeq() : - (await Mediator.Send(new CreateCollection(_model.Name))).LeftToSeq(); + (await _mediator.Send(new UpdateCollection(Id, _model.Name))).LeftToSeq() : + (await _mediator.Send(new CreateCollection(_model.Name))).LeftToSeq(); errorMessage.HeadOrNone().Match( error => { - Snackbar.Add(error.Value, Severity.Error); - Logger.LogError("Error saving collection: {Error}", error.Value); + _snackbar.Add(error.Value, Severity.Error); + _logger.LogError("Error saving collection: {Error}", error.Value); }, - () => NavigationManager.NavigateTo(_model.Id > 0 ? $"/media/collections/{_model.Id}" : "/media/collections")); + () => _navigationManager.NavigateTo(_model.Id > 0 ? $"/media/collections/{_model.Id}" : "/media/collections")); } } diff --git a/ErsatzTV/Pages/CollectionItems.razor b/ErsatzTV/Pages/CollectionItems.razor index 4914489e2..f98c1a66b 100644 --- a/ErsatzTV/Pages/CollectionItems.razor +++ b/ErsatzTV/Pages/CollectionItems.razor @@ -3,9 +3,9 @@ @using ErsatzTV.Application.MediaCards.Queries @using ErsatzTV.Application.MediaCollections.Commands @inherits MultiSelectBase -@inject NavigationManager NavigationManager -@inject ChannelWriter Channel -@inject IJSRuntime JsRuntime +@inject NavigationManager _navigationManager +@inject ChannelWriter _channel +@inject IJSRuntime _jsRuntime
@@ -38,27 +38,27 @@
@if (_data.MovieCards.Any()) { - @_data.MovieCards.Count Movies + @_data.MovieCards.Count Movies } @if (_data.ShowCards.Any()) { - @_data.ShowCards.Count Shows + @_data.ShowCards.Count Shows } @if (_data.SeasonCards.Any()) { - @_data.SeasonCards.Count Seasons + @_data.SeasonCards.Count Seasons } @if (_data.EpisodeCards.Any()) { - @_data.EpisodeCards.Count Episodes + @_data.EpisodeCards.Count Episodes } @if (_data.ArtistCards.Any()) { - @_data.ArtistCards.Count Artists + @_data.ArtistCards.Count Artists } @if (_data.MusicVideoCards.Any()) { - @_data.MusicVideoCards.Count Music Videos + @_data.MusicVideoCards.Count Music Videos } @if (SupportsCustomOrdering()) { @@ -242,7 +242,7 @@ maybeResult.Match( result => _data = result, - error => NavigationManager.NavigateTo("404")); + error => _navigationManager.NavigateTo("404")); } private IOrderedEnumerable OrderMovies(List movies) @@ -257,14 +257,14 @@ protected override async Task OnAfterRenderAsync(bool firstRender) { - await JsRuntime.InvokeVoidAsync("sortableCollection", Id); + await _jsRuntime.InvokeVoidAsync("sortableCollection", Id); if (_data.UseCustomPlaybackOrder) { - await JsRuntime.InvokeVoidAsync("enableSorting"); + await _jsRuntime.InvokeVoidAsync("enableSorting"); } else { - await JsRuntime.InvokeVoidAsync("disableSorting"); + await _jsRuntime.InvokeVoidAsync("disableSorting"); } await base.OnAfterRenderAsync(firstRender); } diff --git a/ErsatzTV/Pages/Collections.razor b/ErsatzTV/Pages/Collections.razor index 41600051f..bfce7ac3c 100644 --- a/ErsatzTV/Pages/Collections.razor +++ b/ErsatzTV/Pages/Collections.razor @@ -5,8 +5,8 @@ @using ErsatzTV.Application.Configuration.Queries @using ErsatzTV.Application.MediaCards @using ErsatzTV.Application.Configuration.Commands -@inject IDialogService Dialog -@inject IMediator Mediator +@inject IDialogService _dialog +@inject IMediator _mediator _rowsPerPage = await Mediator.Send(new GetConfigElementByKey(ConfigElementKey.CollectionsPageSize)) + 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) @@ -66,11 +66,11 @@ var parameters = new DialogParameters { { "EntityType", "collection" }, { "EntityName", collection.Name } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Delete Collection", parameters, options); + IDialogReference dialog = _dialog.Show("Delete Collection", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled) { - await Mediator.Send(new DeleteCollection(collection.Id)); + await _mediator.Send(new DeleteCollection(collection.Id)); await _table.ReloadServerData(); } } @@ -79,9 +79,9 @@ private async Task> ServerReload(TableState state) { - await Mediator.Send(new SaveConfigElementByKey(ConfigElementKey.CollectionsPageSize, state.PageSize.ToString())); + await _mediator.Send(new SaveConfigElementByKey(ConfigElementKey.CollectionsPageSize, state.PageSize.ToString())); - PagedMediaCollectionsViewModel data = await Mediator.Send(new GetPagedCollections(state.Page, state.PageSize)); + PagedMediaCollectionsViewModel data = await _mediator.Send(new GetPagedCollections(state.Page, state.PageSize)); return new TableData { TotalItems = data.TotalCount, Items = data.Page }; } diff --git a/ErsatzTV/Pages/FFmpegEditor.razor b/ErsatzTV/Pages/FFmpegEditor.razor index c762e4632..5eda50046 100644 --- a/ErsatzTV/Pages/FFmpegEditor.razor +++ b/ErsatzTV/Pages/FFmpegEditor.razor @@ -5,10 +5,10 @@ @using ErsatzTV.Application.FFmpegProfiles @using ErsatzTV.Application.FFmpegProfiles.Commands @using ErsatzTV.Application.FFmpegProfiles.Queries -@inject NavigationManager NavigationManager -@inject ILogger Logger -@inject ISnackbar Snackbar -@inject IMediator Mediator +@inject NavigationManager _navigationManager +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IMediator _mediator @@ -113,18 +113,18 @@ protected override async Task OnParametersSetAsync() { - _resolutions = await Mediator.Send(new GetAllResolutions()); + _resolutions = await _mediator.Send(new GetAllResolutions()); if (IsEdit) { - Option profile = await Mediator.Send(new GetFFmpegProfileById(Id)); + Option profile = await _mediator.Send(new GetFFmpegProfileById(Id)); profile.Match( ffmpegProfileViewModel => _model = new FFmpegProfileEditViewModel(ffmpegProfileViewModel), - () => NavigationManager.NavigateTo("404")); + () => _navigationManager.NavigateTo("404")); } else { - _model = new FFmpegProfileEditViewModel(await Mediator.Send(new NewFFmpegProfile())); + _model = new FFmpegProfileEditViewModel(await _mediator.Send(new NewFFmpegProfile())); } _editContext = new EditContext(_model); @@ -139,16 +139,16 @@ if (_editContext.Validate()) { Seq errorMessage = IsEdit ? - (await Mediator.Send(_model.ToUpdate())).LeftToSeq() : - (await Mediator.Send(_model.ToCreate())).LeftToSeq(); + (await _mediator.Send(_model.ToUpdate())).LeftToSeq() : + (await _mediator.Send(_model.ToCreate())).LeftToSeq(); errorMessage.HeadOrNone().Match( error => { - Snackbar.Add("Unexpected error saving ffmpeg profile"); - Logger.LogError("Unexpected error saving ffmpeg profile: {Error}", error.Value); + _snackbar.Add("Unexpected error saving ffmpeg profile"); + _logger.LogError("Unexpected error saving ffmpeg profile: {Error}", error.Value); }, - () => NavigationManager.NavigateTo("/ffmpeg")); + () => _navigationManager.NavigateTo("/ffmpeg")); } } diff --git a/ErsatzTV/Pages/Libraries.razor b/ErsatzTV/Pages/Libraries.razor index 4514df09b..6f6a6a710 100644 --- a/ErsatzTV/Pages/Libraries.razor +++ b/ErsatzTV/Pages/Libraries.razor @@ -11,13 +11,13 @@ @using ErsatzTV.Application.Emby @using ErsatzTV.Application.Emby.Commands @implements IDisposable -@inject IMediator Mediator -@inject IEntityLocker Locker -@inject ChannelWriter WorkerChannel -@inject ChannelWriter PlexWorkerChannel -@inject ChannelWriter JellyfinWorkerChannel -@inject ChannelWriter EmbyWorkerChannel -@inject ICourier Courier +@inject IMediator _mediator +@inject IEntityLocker _locker +@inject ChannelWriter _workerChannel +@inject ChannelWriter _plexWorkerChannel +@inject ChannelWriter _jellyfinWorkerChannel +@inject ChannelWriter _embyWorkerChannel +@inject ICourier _courier @@ -42,7 +42,7 @@ @context.MediaKind
- @if (Locker.IsLibraryLocked(context.Id)) + @if (_locker.IsLibraryLocked(context.Id)) {
@if (_progressByLibrary[context.Id] > 0) @@ -61,7 +61,7 @@
@@ -75,7 +75,7 @@ { @@ -92,35 +92,35 @@ protected override void OnInitialized() { - Locker.OnLibraryChanged += LockChanged; - Courier.Subscribe(HandleScanProgress); + _locker.OnLibraryChanged += LockChanged; + _courier.Subscribe(HandleScanProgress); } protected override async Task OnParametersSetAsync() => await LoadLibraries(); private async Task LoadLibraries() { - _libraries = await Mediator.Send(new GetAllLibraries()); + _libraries = await _mediator.Send(new GetAllLibraries()); _progressByLibrary = _libraries.ToDictionary(vm => vm.Id, _ => 0); } private async Task ScanLibrary(LibraryViewModel library) { - if (Locker.LockLibrary(library.Id)) + if (_locker.LockLibrary(library.Id)) { switch (library) { case LocalLibraryViewModel: - await WorkerChannel.WriteAsync(new ForceScanLocalLibrary(library.Id)); + await _workerChannel.WriteAsync(new ForceScanLocalLibrary(library.Id)); break; case PlexLibraryViewModel: - await PlexWorkerChannel.WriteAsync(new ForceSynchronizePlexLibraryById(library.Id)); + await _plexWorkerChannel.WriteAsync(new ForceSynchronizePlexLibraryById(library.Id)); break; case JellyfinLibraryViewModel: - await JellyfinWorkerChannel.WriteAsync(new ForceSynchronizeJellyfinLibraryById(library.Id)); + await _jellyfinWorkerChannel.WriteAsync(new ForceSynchronizeJellyfinLibraryById(library.Id)); break; case EmbyLibraryViewModel: - await EmbyWorkerChannel.WriteAsync(new ForceSynchronizeEmbyLibraryById(library.Id)); + await _embyWorkerChannel.WriteAsync(new ForceSynchronizeEmbyLibraryById(library.Id)); break; } @@ -149,8 +149,8 @@ void IDisposable.Dispose() { - Locker.OnLibraryChanged -= LockChanged; - Courier.UnSubscribe(HandleScanProgress); + _locker.OnLibraryChanged -= LockChanged; + _courier.UnSubscribe(HandleScanProgress); } } \ No newline at end of file diff --git a/ErsatzTV/Pages/LocalLibraryEditor.razor b/ErsatzTV/Pages/LocalLibraryEditor.razor index 7eb701e65..58b0d2dee 100644 --- a/ErsatzTV/Pages/LocalLibraryEditor.razor +++ b/ErsatzTV/Pages/LocalLibraryEditor.razor @@ -2,8 +2,8 @@ @using ErsatzTV.Application.Libraries @using ErsatzTV.Application.Libraries.Commands @using ErsatzTV.Application.Libraries.Queries -@inject IDialogService Dialog -@inject IMediator Mediator +@inject IDialogService _dialog +@inject IMediator _mediator @@ -47,11 +47,11 @@ protected override async Task OnParametersSetAsync() => await LoadLibraryPaths(); private async Task LoadLibraryPaths() => - _libraryPaths = await Mediator.Send(new GetLocalLibraryPaths(Id)); + _libraryPaths = await _mediator.Send(new GetLocalLibraryPaths(Id)); private async Task DeleteLibraryPath(LocalLibraryPathViewModel libraryPath) { - int count = await Mediator.Send(new CountMediaItemsByLibraryPath(libraryPath.Id)); + int count = await _mediator.Send(new CountMediaItemsByLibraryPath(libraryPath.Id)); var parameters = new DialogParameters { @@ -62,11 +62,11 @@ }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Delete Library Path", parameters, options); + IDialogReference dialog = _dialog.Show("Delete Library Path", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled) { - await Mediator.Send(new DeleteLocalLibraryPath(libraryPath.Id)); + await _mediator.Send(new DeleteLocalLibraryPath(libraryPath.Id)); await LoadLibraryPaths(); } } diff --git a/ErsatzTV/Pages/LocalLibraryPathEditor.razor b/ErsatzTV/Pages/LocalLibraryPathEditor.razor index f47abef22..681506717 100644 --- a/ErsatzTV/Pages/LocalLibraryPathEditor.razor +++ b/ErsatzTV/Pages/LocalLibraryPathEditor.razor @@ -3,12 +3,12 @@ @using ErsatzTV.Application.Libraries.Commands @using ErsatzTV.Application.Libraries.Queries @using ErsatzTV.Application.MediaSources.Commands -@inject NavigationManager NavigationManager -@inject ILogger Logger -@inject ISnackbar Snackbar -@inject IMediator Mediator -@inject IEntityLocker Locker -@inject ChannelWriter Channel +@inject NavigationManager _navigationManager +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IMediator _mediator +@inject IEntityLocker _locker +@inject ChannelWriter _channel @_library.Name - Add Local Library Path @@ -44,10 +44,10 @@ protected override async Task OnParametersSetAsync() { - Option maybeLibrary = await Mediator.Send(new GetLocalLibraryById(Id)); + Option maybeLibrary = await _mediator.Send(new GetLocalLibraryById(Id)); maybeLibrary.Match( library => _library = library, - () => NavigationManager.NavigateTo("404")); + () => _navigationManager.NavigateTo("404")); } protected override void OnInitialized() @@ -62,20 +62,20 @@ if (_editContext.Validate()) { var command = new CreateLocalLibraryPath(_library.Id, _model.Path); - Either result = await Mediator.Send(command); + Either result = await _mediator.Send(command); await result.Match( Left: error => { - Snackbar.Add(error.Value, Severity.Error); - Logger.LogError("Unexpected error saving local library path: {Error}", error.Value); + _snackbar.Add(error.Value, Severity.Error); + _logger.LogError("Unexpected error saving local library path: {Error}", error.Value); return Task.CompletedTask; }, Right: async _ => { - if (Locker.LockLibrary(_library.Id)) + if (_locker.LockLibrary(_library.Id)) { - await Channel.WriteAsync(new ScanLocalLibraryIfNeeded(_library.Id)); - NavigationManager.NavigateTo("/media/libraries"); + await _channel.WriteAsync(new ScanLocalLibraryIfNeeded(_library.Id)); + _navigationManager.NavigateTo("/media/libraries"); } }); } diff --git a/ErsatzTV/Pages/Logs.razor b/ErsatzTV/Pages/Logs.razor index 424229c0f..932ef13cb 100644 --- a/ErsatzTV/Pages/Logs.razor +++ b/ErsatzTV/Pages/Logs.razor @@ -1,7 +1,7 @@ @page "/system/logs" @using ErsatzTV.Application.Logs @using ErsatzTV.Application.Logs.Queries -@inject IMediator Mediator +@inject IMediator _mediator @@ -32,6 +32,6 @@ @code { private List _logEntries; - protected override async Task OnInitializedAsync() => _logEntries = await Mediator.Send(new GetRecentLogEntries()); + protected override async Task OnInitializedAsync() => _logEntries = await _mediator.Send(new GetRecentLogEntries()); } \ No newline at end of file diff --git a/ErsatzTV/Pages/Movie.razor b/ErsatzTV/Pages/Movie.razor index 4fe3b2b8a..e9c43e0e0 100644 --- a/ErsatzTV/Pages/Movie.razor +++ b/ErsatzTV/Pages/Movie.razor @@ -5,9 +5,9 @@ @using ErsatzTV.Application.MediaCards @using ErsatzTV.Application.MediaCollections @using ErsatzTV.Application.MediaCollections.Commands -@inject IMediator Mediator -@inject IDialogService Dialog -@inject NavigationManager NavigationManager +@inject IMediator _mediator +@inject IDialogService _dialog +@inject NavigationManager _navigationManager
@@ -144,7 +144,7 @@ protected override Task OnParametersSetAsync() => RefreshData(); private Task RefreshData() => - Mediator.Send(new GetMovieById(MovieId)).IfSomeAsync(vm => + _mediator.Send(new GetMovieById(MovieId)).IfSomeAsync(vm => { _movie = vm; _sortedLanguages = _movie.Languages.OrderBy(ci => ci.EnglishName).ToList(); @@ -158,12 +158,12 @@ var parameters = new DialogParameters { { "EntityType", "movie" }, { "EntityName", _movie.Title } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) { - await Mediator.Send(new AddMovieToCollection(collection.Id, MovieId)); - NavigationManager.NavigateTo($"/media/collections/{collection.Id}"); + await _mediator.Send(new AddMovieToCollection(collection.Id, MovieId)); + _navigationManager.NavigateTo($"/media/collections/{collection.Id}"); } } diff --git a/ErsatzTV/Pages/MovieList.razor b/ErsatzTV/Pages/MovieList.razor index 8394befa3..9b4d8a105 100644 --- a/ErsatzTV/Pages/MovieList.razor +++ b/ErsatzTV/Pages/MovieList.razor @@ -9,8 +9,8 @@ @using ErsatzTV.Application.Search.Queries @using Unit = LanguageExt.Unit @inherits MultiSelectBase -@inject NavigationManager NavigationManager -@inject ChannelWriter Channel +@inject NavigationManager _navigationManager +@inject ChannelWriter _channel
@@ -89,7 +89,7 @@ PageNumber = 1; } - string query = new Uri(NavigationManager.Uri).Query; + string query = new Uri(_navigationManager.Uri).Query; if (QueryHelpers.ParseQuery(query).TryGetValue("query", out StringValues value)) { _query = value; @@ -115,7 +115,7 @@ { uri = QueryHelpers.AddQueryString(uri, "query", _query); } - NavigationManager.NavigateTo(uri); + _navigationManager.NavigateTo(uri); } private void NextPage() @@ -125,7 +125,7 @@ { uri = QueryHelpers.AddQueryString(uri, "query", _query); } - NavigationManager.NavigateTo(uri); + _navigationManager.NavigateTo(uri); } private void SelectClicked(MediaCardViewModel card, MouseEventArgs e) diff --git a/ErsatzTV/Pages/MusicVideoList.razor b/ErsatzTV/Pages/MusicVideoList.razor index dda224e7f..8ccfb9030 100644 --- a/ErsatzTV/Pages/MusicVideoList.razor +++ b/ErsatzTV/Pages/MusicVideoList.razor @@ -9,8 +9,8 @@ @using ErsatzTV.Application.Search.Queries @using Unit = LanguageExt.Unit @inherits MultiSelectBase -@inject NavigationManager NavigationManager -@inject ChannelWriter Channel +@inject NavigationManager _navigationManager +@inject ChannelWriter _channel
@@ -90,7 +90,7 @@ PageNumber = 1; } - string query = new Uri(NavigationManager.Uri).Query; + string query = new Uri(_navigationManager.Uri).Query; if (QueryHelpers.ParseQuery(query).TryGetValue("query", out StringValues value)) { _query = value; @@ -116,7 +116,7 @@ { uri = QueryHelpers.AddQueryString(uri, "query", _query); } - NavigationManager.NavigateTo(uri); + _navigationManager.NavigateTo(uri); } private void NextPage() @@ -126,7 +126,7 @@ { uri = QueryHelpers.AddQueryString(uri, "query", _query); } - NavigationManager.NavigateTo(uri); + _navigationManager.NavigateTo(uri); } private void SelectClicked(MediaCardViewModel card, MouseEventArgs e) diff --git a/ErsatzTV/Pages/PlayoutEditor.razor b/ErsatzTV/Pages/PlayoutEditor.razor index d776efce1..cc57f0885 100644 --- a/ErsatzTV/Pages/PlayoutEditor.razor +++ b/ErsatzTV/Pages/PlayoutEditor.razor @@ -3,10 +3,10 @@ @using ErsatzTV.Application.Channels.Queries @using ErsatzTV.Application.ProgramSchedules @using ErsatzTV.Application.ProgramSchedules.Queries -@inject NavigationManager NavigationManager -@inject ILogger Logger -@inject ISnackbar Snackbar -@inject IMediator Mediator +@inject NavigationManager _navigationManager +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IMediator _mediator
@@ -40,9 +40,9 @@ protected override async Task OnParametersSetAsync() { - _channels = await Mediator.Send(new GetAllChannels()) + _channels = await _mediator.Send(new GetAllChannels()) .Map(list => list.OrderBy(vm => decimal.Parse(vm.Number)).ToList()); - _programSchedules = await Mediator.Send(new GetAllProgramSchedules()) + _programSchedules = await _mediator.Send(new GetAllProgramSchedules()) .Map(list => list.OrderBy(vm => vm.Name).ToList()); } @@ -64,15 +64,15 @@ _messageStore.Clear(); if (_editContext.Validate()) { - Seq errorMessage = (await Mediator.Send(_model.ToCreate())).LeftToSeq(); + Seq errorMessage = (await _mediator.Send(_model.ToCreate())).LeftToSeq(); errorMessage.HeadOrNone().Match( error => { - Snackbar.Add(error.Value, Severity.Error); - Logger.LogError("Unexpected error saving playout: {Error}", error.Value); + _snackbar.Add(error.Value, Severity.Error); + _logger.LogError("Unexpected error saving playout: {Error}", error.Value); }, - () => NavigationManager.NavigateTo("/playouts")); + () => _navigationManager.NavigateTo("/playouts")); } } diff --git a/ErsatzTV/Pages/Playouts.razor b/ErsatzTV/Pages/Playouts.razor index 2e6470bff..75807e45d 100644 --- a/ErsatzTV/Pages/Playouts.razor +++ b/ErsatzTV/Pages/Playouts.razor @@ -2,8 +2,8 @@ @using ErsatzTV.Application.Playouts @using ErsatzTV.Application.Playouts.Commands @using ErsatzTV.Application.Playouts.Queries -@inject IDialogService Dialog -@inject IMediator Mediator +@inject IDialogService _dialog +@inject IMediator _mediator @@ -90,7 +90,7 @@ private async Task PlayoutSelected(PlayoutViewModel playout) { _selectedPlayoutId = playout.Id; - _selectedPlayoutItems = await Mediator.Send(new GetPlayoutItemsById(playout.Id)); + _selectedPlayoutItems = await _mediator.Send(new GetPlayoutItemsById(playout.Id)); } private async Task DeletePlayout(PlayoutViewModel playout) @@ -98,18 +98,18 @@ var parameters = new DialogParameters { { "EntityType", "playout" }, { "EntityName", $"{playout.ProgramSchedule.Name} on {playout.Channel.Number} - {playout.Channel.Name}" } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Delete Playout", parameters, options); + IDialogReference dialog = _dialog.Show("Delete Playout", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled) { - await Mediator.Send(new DeletePlayout(playout.Id)); + await _mediator.Send(new DeletePlayout(playout.Id)); await LoadAllPlayouts(); } } private async Task RebuildPlayout(PlayoutViewModel playout) { - await Mediator.Send(new BuildPlayout(playout.Id, true)); + await _mediator.Send(new BuildPlayout(playout.Id, true)); await LoadAllPlayouts(); if (_selectedPlayoutId == playout.Id) { @@ -118,7 +118,7 @@ } private async Task LoadAllPlayouts() => - _playouts = await Mediator.Send(new GetAllPlayouts()) + _playouts = await _mediator.Send(new GetAllPlayouts()) .Map(list => list.OrderBy(x => decimal.Parse(x.Channel.Number)).ToList()); diff --git a/ErsatzTV/Pages/PlexMediaSources.razor b/ErsatzTV/Pages/PlexMediaSources.razor index d98034b92..77bdf1b09 100644 --- a/ErsatzTV/Pages/PlexMediaSources.razor +++ b/ErsatzTV/Pages/PlexMediaSources.razor @@ -4,13 +4,13 @@ @using ErsatzTV.Application.Plex.Commands @using ErsatzTV.Application.Plex.Queries @implements IDisposable -@inject IDialogService Dialog -@inject IMediator Mediator -@inject IEntityLocker Locker -@inject ISnackbar Snackbar -@inject ILogger Logger -@inject IJSRuntime JsRuntime -@inject IPlexSecretStore PlexSecretStore +@inject IDialogService _dialog +@inject IMediator _mediator +@inject IEntityLocker _locker +@inject ISnackbar _snackbar +@inject ILogger _logger +@inject IJSRuntime _jsRuntime +@inject IPlexSecretStore _plexSecretStore @@ -51,7 +51,7 @@ Sign out of plex @@ -61,7 +61,7 @@ Sign in to plex @@ -72,7 +72,7 @@ Fix Plex Credentials @@ -88,24 +88,24 @@ protected override async Task OnParametersSetAsync() => await LoadMediaSources(); protected override void OnInitialized() => - Locker.OnPlexChanged += PlexChanged; + _locker.OnPlexChanged += PlexChanged; private async Task LoadMediaSources() { - _isAuthorized = await PlexSecretStore.GetUserAuthTokens().Map(list => Prelude.Optional(list).Flatten().Any()); - _mediaSources = await Mediator.Send(new GetAllPlexMediaSources()); + _isAuthorized = await _plexSecretStore.GetUserAuthTokens().Map(list => Prelude.Optional(list).Flatten().Any()); + _mediaSources = await _mediator.Send(new GetAllPlexMediaSources()); } private async Task SignOutOfPlex() { var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }; - IDialogReference dialog = Dialog.Show("Sign out of Plex", options); + IDialogReference dialog = _dialog.Show("Sign out of Plex", options); DialogResult result = await dialog.Result; if (!result.Cancelled) { - if (Locker.LockPlex()) + if (_locker.LockPlex()) { - await Mediator.Send(new SignOutOfPlex()); + await _mediator.Send(new SignOutOfPlex()); await LoadMediaSources(); } } @@ -113,16 +113,16 @@ private async Task AddPlexMediaSource() { - if (Locker.LockPlex()) + if (_locker.LockPlex()) { - Either maybeUrl = await Mediator.Send(new StartPlexPinFlow()); + Either maybeUrl = await _mediator.Send(new StartPlexPinFlow()); await maybeUrl.Match( - async url => await JsRuntime.InvokeAsync("open", new object[] { url, "_blank" }), + async url => await _jsRuntime.InvokeAsync("open", new object[] { url, "_blank" }), error => { - Locker.UnlockPlex(); - Snackbar.Add(error.Value, Severity.Error); - Logger.LogError("Unexpected error generating plex auth app url: {Error}", error.Value); + _locker.UnlockPlex(); + _snackbar.Add(error.Value, Severity.Error); + _logger.LogError("Unexpected error generating plex auth app url: {Error}", error.Value); return Task.CompletedTask; }); } @@ -134,6 +134,6 @@ await InvokeAsync(StateHasChanged); } - void IDisposable.Dispose() => Locker.OnPlexChanged -= PlexChanged; + void IDisposable.Dispose() => _locker.OnPlexChanged -= PlexChanged; } \ No newline at end of file diff --git a/ErsatzTV/Pages/ScheduleEditor.razor b/ErsatzTV/Pages/ScheduleEditor.razor index 5d6525ff8..d1704304c 100644 --- a/ErsatzTV/Pages/ScheduleEditor.razor +++ b/ErsatzTV/Pages/ScheduleEditor.razor @@ -2,10 +2,10 @@ @page "/schedules/add" @using ErsatzTV.Application.ProgramSchedules @using ErsatzTV.Application.ProgramSchedules.Queries -@inject NavigationManager NavigationManager -@inject ILogger Logger -@inject ISnackbar Snackbar -@inject IMediator Mediator +@inject NavigationManager _navigationManager +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IMediator _mediator
@@ -52,7 +52,7 @@ { if (IsEdit) { - Option maybeProgramSchedule = await Mediator.Send(new GetProgramScheduleById(Id)); + Option maybeProgramSchedule = await _mediator.Send(new GetProgramScheduleById(Id)); maybeProgramSchedule.Match( viewModel => { @@ -61,7 +61,7 @@ _model.MediaCollectionPlaybackOrder = viewModel.MediaCollectionPlaybackOrder; _model.KeepMultiPartEpisodesTogether = viewModel.KeepMultiPartEpisodesTogether; }, - () => NavigationManager.NavigateTo("404")); + () => _navigationManager.NavigateTo("404")); } else { @@ -84,19 +84,19 @@ if (_editContext.Validate()) { Either result = IsEdit ? - await Mediator.Send(_model.ToUpdate()) : - await Mediator.Send(_model.ToCreate()); + await _mediator.Send(_model.ToUpdate()) : + await _mediator.Send(_model.ToCreate()); result.Match( programSchedule => { string destination = IsEdit ? "/schedules" : $"/schedules/{programSchedule.Id}/items"; - NavigationManager.NavigateTo(destination); + _navigationManager.NavigateTo(destination); }, error => { - Snackbar.Add(error.Value, Severity.Error); - Logger.LogError("Unexpected error saving schedule: {Error}", error.Value); + _snackbar.Add(error.Value, Severity.Error); + _logger.LogError("Unexpected error saving schedule: {Error}", error.Value); }); } } diff --git a/ErsatzTV/Pages/ScheduleItemsEditor.razor b/ErsatzTV/Pages/ScheduleItemsEditor.razor index 130f4d314..98e1fefda 100644 --- a/ErsatzTV/Pages/ScheduleItemsEditor.razor +++ b/ErsatzTV/Pages/ScheduleItemsEditor.razor @@ -6,10 +6,10 @@ @using ErsatzTV.Application.ProgramSchedules.Commands @using ErsatzTV.Application.ProgramSchedules.Queries @using ErsatzTV.Application.Television.Queries -@inject NavigationManager NavigationManager -@inject ILogger Logger -@inject ISnackbar Snackbar -@inject IMediator Mediator +@inject NavigationManager _navigationManager +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IMediator _mediator @@ -184,15 +184,15 @@ private async Task LoadScheduleItems() { - _mediaCollections = await Mediator.Send(new GetAllCollections()); - _televisionShows = await Mediator.Send(new GetAllTelevisionShows()); - _televisionSeasons = await Mediator.Send(new GetAllTelevisionSeasons()); + _mediaCollections = await _mediator.Send(new GetAllCollections()); + _televisionShows = await _mediator.Send(new GetAllTelevisionShows()); + _televisionSeasons = await _mediator.Send(new GetAllTelevisionSeasons()); string name = string.Empty; - Option maybeSchedule = await Mediator.Send(new GetProgramScheduleById(Id)); + Option maybeSchedule = await _mediator.Send(new GetProgramScheduleById(Id)); maybeSchedule.IfSome(vm => name = vm.Name); - Option> maybeResults = await Mediator.Send(new GetProgramScheduleItems(Id)); + Option> maybeResults = await _mediator.Send(new GetProgramScheduleItems(Id)); maybeResults.IfSome(items => _schedule = new ProgramScheduleItemsEditViewModel { Name = name, @@ -291,15 +291,15 @@ item.PlayoutMode == PlayoutMode.Duration ? item.OfflineTail.IfNone(false) : null, item.CustomTitle)).ToList(); - Seq errorMessages = await Mediator.Send(new ReplaceProgramScheduleItems(Id, items)).Map(e => e.LeftToSeq()); + Seq errorMessages = await _mediator.Send(new ReplaceProgramScheduleItems(Id, items)).Map(e => e.LeftToSeq()); errorMessages.HeadOrNone().Match( error => { - Snackbar.Add($"Unexpected error saving schedule: {error.Value}", Severity.Error); - Logger.LogError("Unexpected error saving schedule: {Error}", error.Value); + _snackbar.Add($"Unexpected error saving schedule: {error.Value}", Severity.Error); + _logger.LogError("Unexpected error saving schedule: {Error}", error.Value); }, - () => NavigationManager.NavigateTo("/schedules")); + () => _navigationManager.NavigateTo("/schedules")); } } \ No newline at end of file diff --git a/ErsatzTV/Pages/Schedules.razor b/ErsatzTV/Pages/Schedules.razor index e842b828a..051b46300 100644 --- a/ErsatzTV/Pages/Schedules.razor +++ b/ErsatzTV/Pages/Schedules.razor @@ -2,8 +2,8 @@ @using ErsatzTV.Application.ProgramSchedules @using ErsatzTV.Application.ProgramSchedules.Commands @using ErsatzTV.Application.ProgramSchedules.Queries -@inject IDialogService Dialog -@inject IMediator Mediator +@inject IDialogService _dialog +@inject IMediator _mediator @@ -91,7 +91,7 @@ private async Task ScheduleSelected(ProgramScheduleViewModel schedule) { _selectedSchedule = schedule; - await Mediator.Send(new GetProgramScheduleItems(schedule.Id)) + await _mediator.Send(new GetProgramScheduleItems(schedule.Id)) .IterT(results => _selectedScheduleItems = results.OrderBy(x => x.Name).ToList()); } @@ -100,16 +100,16 @@ var parameters = new DialogParameters { { "EntityType", "schedule" }, { "EntityName", programSchedule.Name } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Delete Schedule", parameters, options); + IDialogReference dialog = _dialog.Show("Delete Schedule", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled) { - await Mediator.Send(new DeleteProgramSchedule(programSchedule.Id)); + await _mediator.Send(new DeleteProgramSchedule(programSchedule.Id)); await LoadSchedules(); } } private async Task LoadSchedules() => - _schedules = await Mediator.Send(new GetAllProgramSchedules()).Map(list => list.OrderBy(vm => vm.Name).ToList()); + _schedules = await _mediator.Send(new GetAllProgramSchedules()).Map(list => list.OrderBy(vm => vm.Name).ToList()); } \ No newline at end of file diff --git a/ErsatzTV/Pages/Search.razor b/ErsatzTV/Pages/Search.razor index 85aa132b7..b0911ca9c 100644 --- a/ErsatzTV/Pages/Search.razor +++ b/ErsatzTV/Pages/Search.razor @@ -8,8 +8,8 @@ @using Microsoft.Extensions.Primitives @using Unit = LanguageExt.Unit @inherits MultiSelectBase -@inject NavigationManager NavigationManager -@inject ChannelWriter Channel +@inject NavigationManager _navigationManager +@inject ChannelWriter _channel
@@ -37,22 +37,22 @@ @_query if (_movies.Count > 0) { - @_movies.Count Movies + @_movies.Count Movies } if (_shows.Count > 0) { - @_shows.Count Shows + @_shows.Count Shows } if (_artists.Count > 0) { - @_artists.Count Artists + @_artists.Count Artists } if (_musicVideos.Count > 0) { - @_musicVideos.Count Music Videos + @_musicVideos.Count Music Videos }
Logger -@inject ISnackbar Snackbar -@inject IDialogService Dialog -@inject NavigationManager NavigationManager -@inject ChannelWriter Channel -@inject IJSRuntime JsRuntime +@inject IMediator _mediator +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IDialogService _dialog +@inject NavigationManager _navigationManager +@inject ChannelWriter _channel +@inject IJSRuntime _jsRuntime
@@ -126,7 +126,7 @@ { if (firstRender) { - await NavigationManager.NavigateToFragmentAsync(JsRuntime); + await _navigationManager.NavigateToFragmentAsync(_jsRuntime); } } @@ -134,10 +134,10 @@ private async Task RefreshData() { - await Mediator.Send(new GetTelevisionSeasonById(SeasonId)) + await _mediator.Send(new GetTelevisionSeasonById(SeasonId)) .IfSomeAsync(vm => _season = vm); - _data = await Mediator.Send(new GetTelevisionEpisodeCards(SeasonId, _pageNumber, _pageSize)); + _data = await _mediator.Send(new GetTelevisionEpisodeCards(SeasonId, _pageNumber, _pageSize)); } private async Task AddToCollection() @@ -145,12 +145,12 @@ var parameters = new DialogParameters { { "EntityType", "season" }, { "EntityName", $"{_season.Title} - {_season.Name}" } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) { - await Mediator.Send(new AddSeasonToCollection(collection.Id, SeasonId)); - NavigationManager.NavigateTo($"/media/collections/{collection.Id}"); + await _mediator.Send(new AddSeasonToCollection(collection.Id, SeasonId)); + _navigationManager.NavigateTo($"/media/collections/{collection.Id}"); } } @@ -160,12 +160,12 @@ var parameters = new DialogParameters { { "EntityType", "season" }, { "EntityName", $"{_season.Title} - {_season.Name}" } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Schedule", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Schedule", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is ProgramScheduleViewModel schedule) { - await Mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionSeason, null, SeasonId, null, null, null, null)); - NavigationManager.NavigateTo($"/schedules/{schedule.Id}/items"); + await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionSeason, null, SeasonId, null, null, null, null)); + _navigationManager.NavigateTo($"/schedules/{schedule.Id}/items"); } } @@ -174,19 +174,19 @@ var parameters = new DialogParameters { { "EntityType", "episode" }, { "EntityName", episode.Title } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) { var request = new AddEpisodeToCollection(collection.Id, episode.EpisodeId); - Either addResult = await Mediator.Send(request); + Either addResult = await _mediator.Send(request); addResult.Match( Left: error => { - Snackbar.Add($"Unexpected error adding episode to collection: {error.Value}"); - Logger.LogError("Unexpected error adding episode to collection: {Error}", error.Value); + _snackbar.Add($"Unexpected error adding episode to collection: {error.Value}"); + _logger.LogError("Unexpected error adding episode to collection: {Error}", error.Value); }, - Right: _ => Snackbar.Add($"Added {episode.Title} to collection {collection.Name}", Severity.Success)); + Right: _ => _snackbar.Add($"Added {episode.Title} to collection {collection.Name}", Severity.Success)); } } diff --git a/ErsatzTV/Pages/TelevisionSeasonList.razor b/ErsatzTV/Pages/TelevisionSeasonList.razor index fb7b7b758..e1bc29b85 100644 --- a/ErsatzTV/Pages/TelevisionSeasonList.razor +++ b/ErsatzTV/Pages/TelevisionSeasonList.razor @@ -9,12 +9,12 @@ @using ErsatzTV.Application.ProgramSchedules @using ErsatzTV.Application.ProgramSchedules.Commands @using Unit = LanguageExt.Unit -@inject IMediator Mediator -@inject ILogger Logger -@inject ISnackbar Snackbar -@inject IDialogService Dialog -@inject NavigationManager NavigationManager -@inject ChannelWriter Channel +@inject IMediator _mediator +@inject ILogger _logger +@inject ISnackbar _snackbar +@inject IDialogService _dialog +@inject NavigationManager _navigationManager +@inject ChannelWriter _channel
@@ -175,7 +175,7 @@ private async Task RefreshData() { - await Mediator.Send(new GetTelevisionShowById(ShowId)) + await _mediator.Send(new GetTelevisionShowById(ShowId)) .IfSomeAsync(vm => { _show = vm; @@ -185,7 +185,7 @@ _sortedTags = _show.Tags.OrderBy(t => t).ToList(); }); - _data = await Mediator.Send(new GetTelevisionSeasonCards(ShowId, _pageNumber, _pageSize)); + _data = await _mediator.Send(new GetTelevisionSeasonCards(ShowId, _pageNumber, _pageSize)); } private async Task AddToCollection() @@ -193,12 +193,12 @@ var parameters = new DialogParameters { { "EntityType", "show" }, { "EntityName", _show.Title } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) { - await Mediator.Send(new AddShowToCollection(collection.Id, ShowId)); - NavigationManager.NavigateTo($"/media/collections/{collection.Id}"); + await _mediator.Send(new AddShowToCollection(collection.Id, ShowId)); + _navigationManager.NavigateTo($"/media/collections/{collection.Id}"); } } @@ -207,12 +207,12 @@ var parameters = new DialogParameters { { "EntityType", "show" }, { "EntityName", _show.Title } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Schedule", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Schedule", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is ProgramScheduleViewModel schedule) { - await Mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionShow, null, ShowId, null, null, null, null)); - NavigationManager.NavigateTo($"/schedules/{schedule.Id}/items"); + await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionShow, null, ShowId, null, null, null, null)); + _navigationManager.NavigateTo($"/schedules/{schedule.Id}/items"); } } @@ -223,19 +223,19 @@ var parameters = new DialogParameters { { "EntityType", "season" }, { "EntityName", season.Title } }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall }; - IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); + IDialogReference dialog = _dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) { var request = new AddSeasonToCollection(collection.Id, season.TelevisionSeasonId); - Either addResult = await Mediator.Send(request); + Either addResult = await _mediator.Send(request); addResult.Match( Left: error => { - Snackbar.Add($"Unexpected error adding season to collection: {error.Value}"); - Logger.LogError("Unexpected error adding season to collection: {Error}", error.Value); + _snackbar.Add($"Unexpected error adding season to collection: {error.Value}"); + _logger.LogError("Unexpected error adding season to collection: {Error}", error.Value); }, - Right: _ => Snackbar.Add($"Added {season.Title} to collection {collection.Name}", Severity.Success)); + Right: _ => _snackbar.Add($"Added {season.Title} to collection {collection.Name}", Severity.Success)); } } } diff --git a/ErsatzTV/Pages/TelevisionShowList.razor b/ErsatzTV/Pages/TelevisionShowList.razor index 285055352..8fe5ddc02 100644 --- a/ErsatzTV/Pages/TelevisionShowList.razor +++ b/ErsatzTV/Pages/TelevisionShowList.razor @@ -9,8 +9,8 @@ @using ErsatzTV.Application.Search.Queries @using Unit = LanguageExt.Unit @inherits MultiSelectBase -@inject NavigationManager NavigationManager -@inject ChannelWriter Channel +@inject NavigationManager _navigationManager +@inject ChannelWriter _channel
@@ -89,7 +89,7 @@ PageNumber = 1; } - string query = new Uri(NavigationManager.Uri).Query; + string query = new Uri(_navigationManager.Uri).Query; if (QueryHelpers.ParseQuery(query).TryGetValue("query", out StringValues value)) { _query = value; @@ -115,7 +115,7 @@ { uri = QueryHelpers.AddQueryString(uri, "query", _query); } - NavigationManager.NavigateTo(uri); + _navigationManager.NavigateTo(uri); } private void NextPage() @@ -125,7 +125,7 @@ { uri = QueryHelpers.AddQueryString(uri, "query", _query); } - NavigationManager.NavigateTo(uri); + _navigationManager.NavigateTo(uri); } private void SelectClicked(MediaCardViewModel card, MouseEventArgs e) diff --git a/ErsatzTV/Shared/AddToCollectionDialog.razor b/ErsatzTV/Shared/AddToCollectionDialog.razor index 0383a6804..bcb80689c 100644 --- a/ErsatzTV/Shared/AddToCollectionDialog.razor +++ b/ErsatzTV/Shared/AddToCollectionDialog.razor @@ -2,10 +2,10 @@ @using ErsatzTV.Application.MediaCollections @using ErsatzTV.Application.MediaCollections.Commands @using ErsatzTV.Application.MediaCollections.Queries -@inject IMediator Mediator -@inject IMemoryCache MemoryCache -@inject ISnackbar Snackbar -@inject ILogger Logger +@inject IMediator _mediator +@inject IMemoryCache _memoryCache +@inject ISnackbar _snackbar +@inject ILogger _logger @@ -71,10 +71,10 @@ protected override async Task OnParametersSetAsync() { - _collections = await Mediator.Send(new GetAllCollections()) + _collections = await _mediator.Send(new GetAllCollections()) .Map(list => new[] { _newCollection }.Append(list).ToList()); - if (MemoryCache.TryGetValue("AddToCollectionDialog.SelectedCollectionId", out int id)) + if (_memoryCache.TryGetValue("AddToCollectionDialog.SelectedCollectionId", out int id)) { _selectedCollection = _collections.SingleOrDefault(c => c.Id == id) ?? _newCollection; } @@ -96,24 +96,24 @@ if (_selectedCollection == _newCollection) { Either maybeResult = - await Mediator.Send(new CreateCollection(_newCollectionName)); + await _mediator.Send(new CreateCollection(_newCollectionName)); maybeResult.Match( collection => { - MemoryCache.Set("AddToCollectionDialog.SelectedCollectionId", collection.Id); + _memoryCache.Set("AddToCollectionDialog.SelectedCollectionId", collection.Id); MudDialog.Close(DialogResult.Ok(collection)); }, error => { - Snackbar.Add(error.Value, Severity.Error); - Logger.LogError("Error creating new collection: {Error}", error.Value); + _snackbar.Add(error.Value, Severity.Error); + _logger.LogError("Error creating new collection: {Error}", error.Value); MudDialog.Close(DialogResult.Cancel()); }); } else { - MemoryCache.Set("AddToCollectionDialog.SelectedCollectionId", _selectedCollection.Id); + _memoryCache.Set("AddToCollectionDialog.SelectedCollectionId", _selectedCollection.Id); MudDialog.Close(DialogResult.Ok(_selectedCollection)); } } diff --git a/ErsatzTV/Shared/AddToScheduleDialog.razor b/ErsatzTV/Shared/AddToScheduleDialog.razor index 4d09b2c7c..6601873aa 100644 --- a/ErsatzTV/Shared/AddToScheduleDialog.razor +++ b/ErsatzTV/Shared/AddToScheduleDialog.razor @@ -1,6 +1,6 @@ @using ErsatzTV.Application.ProgramSchedules @using ErsatzTV.Application.ProgramSchedules.Queries -@inject IMediator Mediator +@inject IMediator _mediator
@@ -49,7 +49,7 @@ private ProgramScheduleViewModel _selectedSchedule; protected override async Task OnParametersSetAsync() => - _schedules = await Mediator.Send(new GetAllProgramSchedules()); + _schedules = await _mediator.Send(new GetAllProgramSchedules()); private string FormatText() => $"Select the schedule to add the {EntityType} {EntityName}"; diff --git a/ErsatzTV/Shared/MainLayout.razor b/ErsatzTV/Shared/MainLayout.razor index 7ac643cf7..1f3b2f389 100644 --- a/ErsatzTV/Shared/MainLayout.razor +++ b/ErsatzTV/Shared/MainLayout.razor @@ -3,7 +3,7 @@ @using Microsoft.Extensions.Primitives @using System.Web @inherits LayoutComponentBase -@inject NavigationManager NavigationManager +@inject NavigationManager _navigationManager @@ -107,7 +107,7 @@ { await base.OnParametersSetAsync(); - string query = new Uri(NavigationManager.Uri).Query; + string query = new Uri(_navigationManager.Uri).Query; if (QueryHelpers.ParseQuery(query).TryGetValue("query", out StringValues value)) { _query = value; @@ -118,20 +118,10 @@ } } - private void OnSearchKeyDown(KeyboardEventArgs args) - { - if (args.Code == "Enter") - { - string query = HttpUtility.UrlEncode(_query); - NavigationManager.NavigateTo($"/search?query={query}", true); - StateHasChanged(); - } - } - private void PerformSearch() { string query = HttpUtility.UrlEncode(_query); - NavigationManager.NavigateTo($"/search?query={query}", true); + _navigationManager.NavigateTo($"/search?query={query}", true); StateHasChanged(); } diff --git a/ErsatzTV/Shared/MediaCard.razor b/ErsatzTV/Shared/MediaCard.razor index 5150efc41..91c5a8f40 100644 --- a/ErsatzTV/Shared/MediaCard.razor +++ b/ErsatzTV/Shared/MediaCard.razor @@ -1,7 +1,7 @@ @using static LanguageExt.Prelude @using ErsatzTV.Application.MediaCards @using Unit = LanguageExt.Unit -@inject IMediator Mediator +@inject IMediator _mediator
@if (SelectClicked.HasDelegate || !string.IsNullOrWhiteSpace(Link)) diff --git a/ErsatzTV/Shared/RemoteMediaSourceEditor.razor b/ErsatzTV/Shared/RemoteMediaSourceEditor.razor index fa0629a56..41b88b361 100644 --- a/ErsatzTV/Shared/RemoteMediaSourceEditor.razor +++ b/ErsatzTV/Shared/RemoteMediaSourceEditor.razor @@ -39,8 +39,6 @@ private EditContext _editContext; private ValidationMessageStore _messageStore; - private bool _isValid; - protected override async Task OnParametersSetAsync() => await LoadSecrets(_model); protected override void OnInitialized() diff --git a/ErsatzTV/Shared/RemoveFromCollectionDialog.razor b/ErsatzTV/Shared/RemoveFromCollectionDialog.razor index 43ac19e23..3205621e9 100644 --- a/ErsatzTV/Shared/RemoveFromCollectionDialog.razor +++ b/ErsatzTV/Shared/RemoveFromCollectionDialog.razor @@ -1,4 +1,4 @@ -@inject IMediator Mediator +@inject IMediator _mediator