From b7bd4541b16e66df349b6722b12228f736caae2a Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Tue, 3 Jan 2023 09:14:50 -0600 Subject: [PATCH] hide windows on windows (#1091) * hide windows on windows * update dependencies --- ErsatzTV-Windows/src/main.rs | 8 +++++--- ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj | 2 +- .../ErsatzTV.FFmpeg.Tests.csproj | 2 +- .../ErsatzTV.Infrastructure.Tests.csproj | 2 +- .../ErsatzTV.Scanner.Tests.csproj | 16 +++++++++++----- ErsatzTV/ErsatzTV.csproj | 2 +- ErsatzTV/Pages/Artist.razor | 6 +++--- ErsatzTV/Pages/ArtistList.razor | 2 +- ErsatzTV/Pages/Channels.razor | 2 +- ErsatzTV/Pages/CollectionItems.razor | 2 +- ErsatzTV/Pages/Collections.razor | 6 +++--- ErsatzTV/Pages/EpisodeList.razor | 2 +- ErsatzTV/Pages/FFmpeg.razor | 4 ++-- ErsatzTV/Pages/FillerPresets.razor | 2 +- ErsatzTV/Pages/LocalLibraries.razor | 2 +- ErsatzTV/Pages/LocalLibraryEditor.razor | 4 ++-- ErsatzTV/Pages/Movie.razor | 2 +- ErsatzTV/Pages/MovieList.razor | 2 +- ErsatzTV/Pages/MultiSelectBase.cs | 4 ++-- ErsatzTV/Pages/MusicVideoList.razor | 2 +- ErsatzTV/Pages/OtherVideoList.razor | 2 +- ErsatzTV/Pages/Playouts.razor | 2 +- ErsatzTV/Pages/PlexMediaSources.razor | 2 +- ErsatzTV/Pages/Schedules.razor | 2 +- ErsatzTV/Pages/Search.razor | 16 ++++++++-------- ErsatzTV/Pages/SongList.razor | 2 +- ErsatzTV/Pages/TelevisionEpisodeList.razor | 6 +++--- ErsatzTV/Pages/TelevisionSeasonList.razor | 6 +++--- .../Pages/TelevisionSeasonSearchResults.razor | 2 +- ErsatzTV/Pages/TelevisionShowList.razor | 2 +- ErsatzTV/Pages/TraktLists.razor | 4 ++-- ErsatzTV/Pages/Trash.razor | 6 +++--- ErsatzTV/Pages/Watermarks.razor | 4 ++-- ErsatzTV/Shared/RemoteMediaSources.razor | 2 +- 34 files changed, 70 insertions(+), 62 deletions(-) diff --git a/ErsatzTV-Windows/src/main.rs b/ErsatzTV-Windows/src/main.rs index 3d425e662..6c3d50817 100644 --- a/ErsatzTV-Windows/src/main.rs +++ b/ErsatzTV-Windows/src/main.rs @@ -22,6 +22,7 @@ fn main() { tray.add_menu_item("Launch Web UI", || { let _ = Command::new("cmd") + .creation_flags(CREATE_NO_WINDOW) .arg("/C") .arg("start") .arg("http://localhost:8409") @@ -30,7 +31,7 @@ fn main() { .stderr(Stdio::null()) .spawn(); }) - .unwrap(); + .unwrap(); tray.add_menu_item("Show Logs", || { let path = SpecialFolder::LocalApplicationData @@ -43,6 +44,7 @@ fn main() { Some(folder) => { fs::create_dir_all(folder).unwrap(); let _ = Command::new("cmd") + .creation_flags(CREATE_NO_WINDOW) .arg("/C") .arg("start") .arg(folder) @@ -53,14 +55,14 @@ fn main() { } } }) - .unwrap(); + .unwrap(); tray.inner_mut().add_separator().unwrap(); tray.add_menu_item("Exit", move || { tx.send(Message::Exit).unwrap(); }) - .unwrap(); + .unwrap(); let path = process_path::get_executable_path(); let mut child: Option = None; diff --git a/ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj b/ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj index e7ee9d926..d4ac7317a 100644 --- a/ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj +++ b/ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj @@ -21,7 +21,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj b/ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj index 83cd4b95d..fea4202f7 100644 --- a/ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj +++ b/ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj b/ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj index 0c147cdca..15fcab003 100644 --- a/ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj +++ b/ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj b/ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj index 8b26c8372..77198db96 100644 --- a/ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj +++ b/ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj @@ -11,12 +11,18 @@ - - + + - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/ErsatzTV/ErsatzTV.csproj b/ErsatzTV/ErsatzTV.csproj index bcc13489b..218ab3f0c 100644 --- a/ErsatzTV/ErsatzTV.csproj +++ b/ErsatzTV/ErsatzTV.csproj @@ -70,7 +70,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/ErsatzTV/Pages/Artist.razor b/ErsatzTV/Pages/Artist.razor index e304d8859..057a64716 100644 --- a/ErsatzTV/Pages/Artist.razor +++ b/ErsatzTV/Pages/Artist.razor @@ -242,7 +242,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { await _mediator.Send(new AddArtistToCollection(collection.Id, ArtistId), _cts.Token); _navigationManager.NavigateTo($"media/collections/{collection.Id}"); @@ -256,7 +256,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Schedule", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is ProgramScheduleViewModel schedule) + if (!result.Canceled && result.Data is ProgramScheduleViewModel schedule) { await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.Artist, null, null, null, ArtistId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null, null, null, null, null), _cts.Token); _navigationManager.NavigateTo($"schedules/{schedule.Id}/items"); @@ -270,7 +270,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddMusicVideoToCollection(collection.Id, musicVideo.MusicVideoId); Either addResult = await _mediator.Send(request, _cts.Token); diff --git a/ErsatzTV/Pages/ArtistList.razor b/ErsatzTV/Pages/ArtistList.razor index 2ddc0ac3f..81d76be97 100644 --- a/ErsatzTV/Pages/ArtistList.razor +++ b/ErsatzTV/Pages/ArtistList.razor @@ -138,7 +138,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddArtistToCollection(collection.Id, artist.ArtistId); Either addResult = await Mediator.Send(request, CancellationToken); diff --git a/ErsatzTV/Pages/Channels.razor b/ErsatzTV/Pages/Channels.razor index 2933e8c3b..104abcf79 100644 --- a/ErsatzTV/Pages/Channels.razor +++ b/ErsatzTV/Pages/Channels.razor @@ -106,7 +106,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Channel", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteChannel(channel.Id), _cts.Token); if (_table != null) diff --git a/ErsatzTV/Pages/CollectionItems.razor b/ErsatzTV/Pages/CollectionItems.razor index b4286819d..b9d1f0112 100644 --- a/ErsatzTV/Pages/CollectionItems.razor +++ b/ErsatzTV/Pages/CollectionItems.razor @@ -464,7 +464,7 @@ IDialogReference dialog = Dialog.Show("Remove From Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await Mediator.Send(request, CancellationToken); await RefreshData(); diff --git a/ErsatzTV/Pages/Collections.razor b/ErsatzTV/Pages/Collections.razor index 2a4b314a1..2d2d6133d 100644 --- a/ErsatzTV/Pages/Collections.razor +++ b/ErsatzTV/Pages/Collections.razor @@ -167,7 +167,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteCollection(collection.Id), _cts.Token); if (_collectionsTable != null) @@ -184,7 +184,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Multi Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteMultiCollection(collection.Id), _cts.Token); if (_multiCollectionsTable != null) @@ -201,7 +201,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Smart Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteSmartCollection(collection.Id), _cts.Token); if (_smartCollectionsTable != null) diff --git a/ErsatzTV/Pages/EpisodeList.razor b/ErsatzTV/Pages/EpisodeList.razor index b07439a1e..389f24877 100644 --- a/ErsatzTV/Pages/EpisodeList.razor +++ b/ErsatzTV/Pages/EpisodeList.razor @@ -138,7 +138,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddEpisodeToCollection(collection.Id, episode.EpisodeId); Either addResult = await Mediator.Send(request, CancellationToken); diff --git a/ErsatzTV/Pages/FFmpeg.razor b/ErsatzTV/Pages/FFmpeg.razor index b1bbe5348..11a458729 100644 --- a/ErsatzTV/Pages/FFmpeg.razor +++ b/ErsatzTV/Pages/FFmpeg.razor @@ -87,7 +87,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete FFmpeg Profile", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteFFmpegProfile(ffmpegProfile.Id), _cts.Token); await LoadFFmpegProfilesAsync(_cts.Token); @@ -101,7 +101,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Copy FFmpeg Profile", parameters, options); DialogResult dialogResult = await dialog.Result; - if (!dialogResult.Cancelled && dialogResult.Data is FFmpegProfileViewModel data) + if (!dialogResult.Canceled && dialogResult.Data is FFmpegProfileViewModel data) { _navigationManager.NavigateTo($"ffmpeg/{data.Id}"); } diff --git a/ErsatzTV/Pages/FillerPresets.razor b/ErsatzTV/Pages/FillerPresets.razor index 3117e7d91..dae9c9e92 100644 --- a/ErsatzTV/Pages/FillerPresets.razor +++ b/ErsatzTV/Pages/FillerPresets.razor @@ -89,7 +89,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Filler Preset", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteFillerPreset(fillerPreset.Id), _cts.Token); if (_fillerPresetsTable != null) diff --git a/ErsatzTV/Pages/LocalLibraries.razor b/ErsatzTV/Pages/LocalLibraries.razor index 55716a9ba..02ace9130 100644 --- a/ErsatzTV/Pages/LocalLibraries.razor +++ b/ErsatzTV/Pages/LocalLibraries.razor @@ -78,7 +78,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Library", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteLocalLibrary(library.Id), _cts.Token); await LoadLibraries(_cts.Token); diff --git a/ErsatzTV/Pages/LocalLibraryEditor.razor b/ErsatzTV/Pages/LocalLibraryEditor.razor index 841237c03..a760304fa 100644 --- a/ErsatzTV/Pages/LocalLibraryEditor.razor +++ b/ErsatzTV/Pages/LocalLibraryEditor.razor @@ -143,7 +143,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Move Local Library Path", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is LocalLibraryViewModel library) + if (!result.Canceled && result.Data is LocalLibraryViewModel library) { var request = new MoveLocalLibraryPath(libraryPath.Id, library.Id); Either moveResult = await _mediator.Send(request, _cts.Token); @@ -177,7 +177,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Library Path", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { _model.HasChanges = true; _model.Paths.Remove(libraryPath); diff --git a/ErsatzTV/Pages/Movie.razor b/ErsatzTV/Pages/Movie.razor index aa57122d2..fded461ca 100644 --- a/ErsatzTV/Pages/Movie.razor +++ b/ErsatzTV/Pages/Movie.razor @@ -246,7 +246,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { await _mediator.Send(new AddMovieToCollection(collection.Id, MovieId), _cts.Token); _navigationManager.NavigateTo($"media/collections/{collection.Id}"); diff --git a/ErsatzTV/Pages/MovieList.razor b/ErsatzTV/Pages/MovieList.razor index d12255fee..0e81e7f94 100644 --- a/ErsatzTV/Pages/MovieList.razor +++ b/ErsatzTV/Pages/MovieList.razor @@ -137,7 +137,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddMovieToCollection(collection.Id, movie.MovieId); Either addResult = await Mediator.Send(request, CancellationToken); diff --git a/ErsatzTV/Pages/MultiSelectBase.cs b/ErsatzTV/Pages/MultiSelectBase.cs index 36537a363..628e2bf91 100644 --- a/ErsatzTV/Pages/MultiSelectBase.cs +++ b/ErsatzTV/Pages/MultiSelectBase.cs @@ -114,7 +114,7 @@ public class MultiSelectBase : FragmentNavigationBase IDialogReference dialog = await Dialog.ShowAsync("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddItemsToCollection( collection.Id, @@ -155,7 +155,7 @@ public class MultiSelectBase : FragmentNavigationBase parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { var itemIds = SelectedItems.Map(vm => vm.MediaItemId).ToList(); diff --git a/ErsatzTV/Pages/MusicVideoList.razor b/ErsatzTV/Pages/MusicVideoList.razor index 0da5482ad..0f4302d47 100644 --- a/ErsatzTV/Pages/MusicVideoList.razor +++ b/ErsatzTV/Pages/MusicVideoList.razor @@ -138,7 +138,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddMusicVideoToCollection(collection.Id, musicVideo.MusicVideoId); Either addResult = await Mediator.Send(request, CancellationToken); diff --git a/ErsatzTV/Pages/OtherVideoList.razor b/ErsatzTV/Pages/OtherVideoList.razor index d0b60d925..2afd8be81 100644 --- a/ErsatzTV/Pages/OtherVideoList.razor +++ b/ErsatzTV/Pages/OtherVideoList.razor @@ -138,7 +138,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddOtherVideoToCollection(collection.Id, otherVideo.OtherVideoId); Either addResult = await Mediator.Send(request, CancellationToken); diff --git a/ErsatzTV/Pages/Playouts.razor b/ErsatzTV/Pages/Playouts.razor index ec1b58ab5..ef06305bb 100644 --- a/ErsatzTV/Pages/Playouts.razor +++ b/ErsatzTV/Pages/Playouts.razor @@ -155,7 +155,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Playout", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeletePlayout(playout.PlayoutId), _cts.Token); if (_table != null) diff --git a/ErsatzTV/Pages/PlexMediaSources.razor b/ErsatzTV/Pages/PlexMediaSources.razor index 1a5c3fda1..557f4ca83 100644 --- a/ErsatzTV/Pages/PlexMediaSources.razor +++ b/ErsatzTV/Pages/PlexMediaSources.razor @@ -106,7 +106,7 @@ var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }; IDialogReference dialog = await _dialog.ShowAsync("Sign out of Plex", options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { if (_locker.LockPlex()) { diff --git a/ErsatzTV/Pages/Schedules.razor b/ErsatzTV/Pages/Schedules.razor index 39954d143..6c855185d 100644 --- a/ErsatzTV/Pages/Schedules.razor +++ b/ErsatzTV/Pages/Schedules.razor @@ -126,7 +126,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Schedule", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteProgramSchedule(programSchedule.Id), _cts.Token); if (_table != null) diff --git a/ErsatzTV/Pages/Search.razor b/ErsatzTV/Pages/Search.razor index 0d04097ab..0566986dc 100644 --- a/ErsatzTV/Pages/Search.razor +++ b/ErsatzTV/Pages/Search.razor @@ -368,7 +368,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddMovieToCollection(collection.Id, movie.MovieId); Either addResult = await Mediator.Send(request, CancellationToken); @@ -389,7 +389,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddShowToCollection(collection.Id, show.TelevisionShowId); Either addResult = await Mediator.Send(request, CancellationToken); @@ -410,7 +410,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddEpisodeToCollection(collection.Id, episode.EpisodeId); Either addResult = await Mediator.Send(request, CancellationToken); @@ -431,7 +431,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddArtistToCollection(collection.Id, artist.ArtistId); Either addResult = await Mediator.Send(request, CancellationToken); @@ -452,7 +452,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddMusicVideoToCollection(collection.Id, musicVideo.MusicVideoId); Either addResult = await Mediator.Send(request, CancellationToken); @@ -473,7 +473,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddOtherVideoToCollection(collection.Id, otherVideo.OtherVideoId); Either addResult = await Mediator.Send(request, CancellationToken); @@ -494,7 +494,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddSongToCollection(collection.Id, song.SongId); Either addResult = await Mediator.Send(request, CancellationToken); @@ -618,7 +618,7 @@ IDialogReference dialog = Dialog.Show("Save As Smart Collection", options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is SmartCollectionViewModel collection) + if (!result.Canceled && result.Data is SmartCollectionViewModel collection) { var request = new UpdateSmartCollection( collection.Id, diff --git a/ErsatzTV/Pages/SongList.razor b/ErsatzTV/Pages/SongList.razor index f7164eaed..47333058a 100644 --- a/ErsatzTV/Pages/SongList.razor +++ b/ErsatzTV/Pages/SongList.razor @@ -138,7 +138,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddSongToCollection(collection.Id, song.SongId); Either addResult = await Mediator.Send(request, CancellationToken); diff --git a/ErsatzTV/Pages/TelevisionEpisodeList.razor b/ErsatzTV/Pages/TelevisionEpisodeList.razor index 2a5e2f026..c41b8d492 100644 --- a/ErsatzTV/Pages/TelevisionEpisodeList.razor +++ b/ErsatzTV/Pages/TelevisionEpisodeList.razor @@ -216,7 +216,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { await _mediator.Send(new AddSeasonToCollection(collection.Id, SeasonId), _cts.Token); _navigationManager.NavigateTo($"media/collections/{collection.Id}"); @@ -231,7 +231,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Schedule", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is ProgramScheduleViewModel schedule) + if (!result.Canceled && result.Data is ProgramScheduleViewModel schedule) { await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionSeason, null, null, null, SeasonId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null, null, null, null, null), _cts.Token); _navigationManager.NavigateTo($"schedules/{schedule.Id}/items"); @@ -245,7 +245,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddEpisodeToCollection(collection.Id, episode.EpisodeId); Either addResult = await _mediator.Send(request, _cts.Token); diff --git a/ErsatzTV/Pages/TelevisionSeasonList.razor b/ErsatzTV/Pages/TelevisionSeasonList.razor index a99882111..cee9be8b3 100644 --- a/ErsatzTV/Pages/TelevisionSeasonList.razor +++ b/ErsatzTV/Pages/TelevisionSeasonList.razor @@ -212,7 +212,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { await _mediator.Send(new AddShowToCollection(collection.Id, ShowId), _cts.Token); _navigationManager.NavigateTo($"media/collections/{collection.Id}"); @@ -226,7 +226,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Schedule", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is ProgramScheduleViewModel schedule) + if (!result.Canceled && result.Data is ProgramScheduleViewModel schedule) { await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionShow, null, null, null, ShowId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null, null, null, null, null), _cts.Token); _navigationManager.NavigateTo($"schedules/{schedule.Id}/items"); @@ -242,7 +242,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddSeasonToCollection(collection.Id, season.TelevisionSeasonId); Either addResult = await _mediator.Send(request, _cts.Token); diff --git a/ErsatzTV/Pages/TelevisionSeasonSearchResults.razor b/ErsatzTV/Pages/TelevisionSeasonSearchResults.razor index 69dea28c7..806cbc28e 100644 --- a/ErsatzTV/Pages/TelevisionSeasonSearchResults.razor +++ b/ErsatzTV/Pages/TelevisionSeasonSearchResults.razor @@ -137,7 +137,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddSeasonToCollection(collection.Id, season.TelevisionSeasonId); Either addResult = await Mediator.Send(request, CancellationToken); diff --git a/ErsatzTV/Pages/TelevisionShowList.razor b/ErsatzTV/Pages/TelevisionShowList.razor index ca045c8e6..77f79cda6 100644 --- a/ErsatzTV/Pages/TelevisionShowList.razor +++ b/ErsatzTV/Pages/TelevisionShowList.razor @@ -137,7 +137,7 @@ IDialogReference dialog = Dialog.Show("Add To Collection", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is MediaCollectionViewModel collection) + if (!result.Canceled && result.Data is MediaCollectionViewModel collection) { var request = new AddShowToCollection(collection.Id, show.TelevisionShowId); Either addResult = await Mediator.Send(request, CancellationToken); diff --git a/ErsatzTV/Pages/TraktLists.razor b/ErsatzTV/Pages/TraktLists.razor index b98de198b..a84dfa799 100644 --- a/ErsatzTV/Pages/TraktLists.razor +++ b/ErsatzTV/Pages/TraktLists.razor @@ -117,7 +117,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Trakt List", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _workerChannel.WriteAsync(new DeleteTraktList(traktList.Id), _cts.Token); } @@ -143,7 +143,7 @@ var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }; IDialogReference dialog = await _dialog.ShowAsync("Add Trakt List", options); DialogResult result = await dialog.Result; - if (!result.Cancelled && result.Data is string url) + if (!result.Canceled && result.Data is string url) { await _workerChannel.WriteAsync(new AddTraktList(url), _cts.Token); } diff --git a/ErsatzTV/Pages/Trash.razor b/ErsatzTV/Pages/Trash.razor index e464389a0..dd63e5a18 100644 --- a/ErsatzTV/Pages/Trash.razor +++ b/ErsatzTV/Pages/Trash.razor @@ -484,7 +484,7 @@ IDialogReference dialog = Dialog.Show("Delete From Database", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { var request = new DeleteItemsFromDatabase( movieIds.Append(showIds) @@ -564,7 +564,7 @@ IDialogReference dialog = Dialog.Show("Delete From Database", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await Mediator.Send(request, CancellationToken); await RefreshData(); @@ -581,7 +581,7 @@ IDialogReference dialog = Dialog.Show("Delete From Database", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await Mediator.Send(new EmptyTrash(), CancellationToken); await RefreshData(); diff --git a/ErsatzTV/Pages/Watermarks.razor b/ErsatzTV/Pages/Watermarks.razor index 471ef1a7a..10774e5b6 100644 --- a/ErsatzTV/Pages/Watermarks.razor +++ b/ErsatzTV/Pages/Watermarks.razor @@ -93,7 +93,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Delete Watermark", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { await _mediator.Send(new DeleteWatermark(watermark.Id), _cts.Token); await LoadWatermarksAsync(); @@ -107,7 +107,7 @@ IDialogReference dialog = await _dialog.ShowAsync("Copy Watermark", parameters, options); DialogResult dialogResult = await dialog.Result; - if (!dialogResult.Cancelled && dialogResult.Data is WatermarkViewModel data) + if (!dialogResult.Canceled && dialogResult.Data is WatermarkViewModel data) { _navigationManager.NavigateTo($"/watermarks/{data.Id}"); } diff --git a/ErsatzTV/Shared/RemoteMediaSources.razor b/ErsatzTV/Shared/RemoteMediaSources.razor index e0ecc244b..2dccd8974 100644 --- a/ErsatzTV/Shared/RemoteMediaSources.razor +++ b/ErsatzTV/Shared/RemoteMediaSources.razor @@ -121,7 +121,7 @@ var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }; IDialogReference dialog = await _dialog.ShowAsync($"Disconnect {Name}", parameters, options); DialogResult result = await dialog.Result; - if (!result.Cancelled) + if (!result.Canceled) { if (_locker.LockRemoteMediaSource()) {