pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

hide windows on windows (#1091) 

* hide windows on windows

* update dependencies
pull/1092/head
Jason Dove 4 years ago committed by GitHub
parent
648f25e9cc
commit
b7bd4541b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 70 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ErsatzTV-Windows/src/main.rs
  2. 2
      ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
  3. 2
      ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj
  4. 2
      ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj
  5. 16
      ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj
  6. 2
      ErsatzTV/ErsatzTV.csproj
  7. 6
      ErsatzTV/Pages/Artist.razor
  8. 2
      ErsatzTV/Pages/ArtistList.razor
  9. 2
      ErsatzTV/Pages/Channels.razor
  10. 2
      ErsatzTV/Pages/CollectionItems.razor
  11. 6
      ErsatzTV/Pages/Collections.razor
  12. 2
      ErsatzTV/Pages/EpisodeList.razor
  13. 4
      ErsatzTV/Pages/FFmpeg.razor
  14. 2
      ErsatzTV/Pages/FillerPresets.razor
  15. 2
      ErsatzTV/Pages/LocalLibraries.razor
  16. 4
      ErsatzTV/Pages/LocalLibraryEditor.razor
  17. 2
      ErsatzTV/Pages/Movie.razor
  18. 2
      ErsatzTV/Pages/MovieList.razor
  19. 4
      ErsatzTV/Pages/MultiSelectBase.cs
  20. 2
      ErsatzTV/Pages/MusicVideoList.razor
  21. 2
      ErsatzTV/Pages/OtherVideoList.razor
  22. 2
      ErsatzTV/Pages/Playouts.razor
  23. 2
      ErsatzTV/Pages/PlexMediaSources.razor
  24. 2
      ErsatzTV/Pages/Schedules.razor
  25. 16
      ErsatzTV/Pages/Search.razor
  26. 2
      ErsatzTV/Pages/SongList.razor
  27. 6
      ErsatzTV/Pages/TelevisionEpisodeList.razor
  28. 6
      ErsatzTV/Pages/TelevisionSeasonList.razor
  29. 2
      ErsatzTV/Pages/TelevisionSeasonSearchResults.razor
  30. 2
      ErsatzTV/Pages/TelevisionShowList.razor
  31. 4
      ErsatzTV/Pages/TraktLists.razor
  32. 6
      ErsatzTV/Pages/Trash.razor
  33. 4
      ErsatzTV/Pages/Watermarks.razor
  34. 2
      ErsatzTV/Shared/RemoteMediaSources.razor

8
ErsatzTV-Windows/src/main.rs
Unescape View File

@ -22,6 +22,7 @@ fn main() {
tray.add_menu_item("Launch Web UI", || { tray.add_menu_item("Launch Web UI", || {
let _ = Command::new("cmd") let _ = Command::new("cmd")
.creation_flags(CREATE_NO_WINDOW)
.arg("/C") .arg("/C")
.arg("start") .arg("start")
.arg("http://localhost:8409") .arg("http://localhost:8409")
@ -30,7 +31,7 @@ fn main() {
.stderr(Stdio::null()) .stderr(Stdio::null())
.spawn(); .spawn();
}) })
.unwrap(); .unwrap();
tray.add_menu_item("Show Logs", || { tray.add_menu_item("Show Logs", || {
let path = SpecialFolder::LocalApplicationData let path = SpecialFolder::LocalApplicationData
@ -43,6 +44,7 @@ fn main() {
Some(folder) => { Some(folder) => {
fs::create_dir_all(folder).unwrap(); fs::create_dir_all(folder).unwrap();
let _ = Command::new("cmd") let _ = Command::new("cmd")
.creation_flags(CREATE_NO_WINDOW)
.arg("/C") .arg("/C")
.arg("start") .arg("start")
.arg(folder) .arg(folder)
@ -53,14 +55,14 @@ fn main() {
} }
} }
}) })
.unwrap(); .unwrap();
tray.inner_mut().add_separator().unwrap(); tray.inner_mut().add_separator().unwrap();
tray.add_menu_item("Exit", move || { tray.add_menu_item("Exit", move || {
tx.send(Message::Exit).unwrap(); tx.send(Message::Exit).unwrap();
}) })
.unwrap(); .unwrap();
let path = process_path::get_executable_path(); let path = process_path::get_executable_path();
let mut child: Option<Child> = None; let mut child: Option<Child> = None;

2
ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj
Unescape View File

@ -21,7 +21,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Moq" Version="4.18.3" /> <PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Serilog" Version="2.12.0" /> <PackageReference Include="Serilog" Version="2.12.0" />

2
ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj
Unescape View File

@ -11,7 +11,7 @@
<PackageReference Include="FluentAssertions" Version="6.8.0" /> <PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.3" /> <PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" /> <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />

2
ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj
Unescape View File

@ -11,7 +11,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.8.0" /> <PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.3" /> <PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="NUnit.Analyzers" Version="3.5.0"> <PackageReference Include="NUnit.Analyzers" Version="3.5.0">

16
ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj
Unescape View File

@ -11,12 +11,18 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.8.0" /> <PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="LanguageExt.Core" Version="4.4.0" /> <PackageReference Include="LanguageExt.Core" Version="4.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.3" /> <PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="NUnit.Analyzers" Version="3.3.0" /> <PackageReference Include="NUnit.Analyzers" Version="3.5.0">
<PackageReference Include="coverlet.collector" Version="3.1.2" /> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
ErsatzTV/ErsatzTV.csproj
Unescape View File

@ -70,7 +70,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MudBlazor" Version="6.1.6" /> <PackageReference Include="MudBlazor" Version="6.1.7" />
<PackageReference Include="NaturalSort.Extension" Version="4.0.0" /> <PackageReference Include="NaturalSort.Extension" Version="4.0.0" />
<PackageReference Include="PPioli.FluentValidation.Blazor" Version="11.1.0" /> <PackageReference Include="PPioli.FluentValidation.Blazor" Version="11.1.0" />
<PackageReference Include="Refit.HttpClientFactory" Version="6.3.2" /> <PackageReference Include="Refit.HttpClientFactory" Version="6.3.2" />

6
ErsatzTV/Pages/Artist.razor
Unescape View File

@ -242,7 +242,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); await _mediator.Send(new AddArtistToCollection(collection.Id, ArtistId), _cts.Token);
_navigationManager.NavigateTo($"media/collections/{collection.Id}"); _navigationManager.NavigateTo($"media/collections/{collection.Id}");
@ -256,7 +256,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToScheduleDialog>("Add To Schedule", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToScheduleDialog>("Add To Schedule", parameters, options);
DialogResult result = await dialog.Result; 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); 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"); _navigationManager.NavigateTo($"schedules/{schedule.Id}/items");
@ -270,7 +270,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddMusicVideoToCollection(collection.Id, musicVideo.MusicVideoId);
Either<BaseError, Unit> addResult = await _mediator.Send(request, _cts.Token); Either<BaseError, Unit> addResult = await _mediator.Send(request, _cts.Token);

2
ErsatzTV/Pages/ArtistList.razor
Unescape View File

@ -138,7 +138,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddArtistToCollection(collection.Id, artist.ArtistId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);

2
ErsatzTV/Pages/Channels.razor
Unescape View File

@ -106,7 +106,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Channel", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Channel", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteChannel(channel.Id), _cts.Token); await _mediator.Send(new DeleteChannel(channel.Id), _cts.Token);
if (_table != null) if (_table != null)

2
ErsatzTV/Pages/CollectionItems.razor
Unescape View File

@ -464,7 +464,7 @@
IDialogReference dialog = Dialog.Show<RemoveFromCollectionDialog>("Remove From Collection", parameters, options); IDialogReference dialog = Dialog.Show<RemoveFromCollectionDialog>("Remove From Collection", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await Mediator.Send(request, CancellationToken); await Mediator.Send(request, CancellationToken);
await RefreshData(); await RefreshData();

6
ErsatzTV/Pages/Collections.razor
Unescape View File

@ -167,7 +167,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Collection", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteCollection(collection.Id), _cts.Token); await _mediator.Send(new DeleteCollection(collection.Id), _cts.Token);
if (_collectionsTable != null) if (_collectionsTable != null)
@ -184,7 +184,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Multi Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Multi Collection", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteMultiCollection(collection.Id), _cts.Token); await _mediator.Send(new DeleteMultiCollection(collection.Id), _cts.Token);
if (_multiCollectionsTable != null) if (_multiCollectionsTable != null)
@ -201,7 +201,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Smart Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Smart Collection", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteSmartCollection(collection.Id), _cts.Token); await _mediator.Send(new DeleteSmartCollection(collection.Id), _cts.Token);
if (_smartCollectionsTable != null) if (_smartCollectionsTable != null)

2
ErsatzTV/Pages/EpisodeList.razor
Unescape View File

@ -138,7 +138,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddEpisodeToCollection(collection.Id, episode.EpisodeId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);

4
ErsatzTV/Pages/FFmpeg.razor
Unescape View File

@ -87,7 +87,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete FFmpeg Profile", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete FFmpeg Profile", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteFFmpegProfile(ffmpegProfile.Id), _cts.Token); await _mediator.Send(new DeleteFFmpegProfile(ffmpegProfile.Id), _cts.Token);
await LoadFFmpegProfilesAsync(_cts.Token); await LoadFFmpegProfilesAsync(_cts.Token);
@ -101,7 +101,7 @@
IDialogReference dialog = await _dialog.ShowAsync<CopyFFmpegProfileDialog>("Copy FFmpeg Profile", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<CopyFFmpegProfileDialog>("Copy FFmpeg Profile", parameters, options);
DialogResult dialogResult = await dialog.Result; 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}"); _navigationManager.NavigateTo($"ffmpeg/{data.Id}");
} }

2
ErsatzTV/Pages/FillerPresets.razor
Unescape View File

@ -89,7 +89,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Filler Preset", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Filler Preset", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteFillerPreset(fillerPreset.Id), _cts.Token); await _mediator.Send(new DeleteFillerPreset(fillerPreset.Id), _cts.Token);
if (_fillerPresetsTable != null) if (_fillerPresetsTable != null)

2
ErsatzTV/Pages/LocalLibraries.razor
Unescape View File

@ -78,7 +78,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Library", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Library", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteLocalLibrary(library.Id), _cts.Token); await _mediator.Send(new DeleteLocalLibrary(library.Id), _cts.Token);
await LoadLibraries(_cts.Token); await LoadLibraries(_cts.Token);

4
ErsatzTV/Pages/LocalLibraryEditor.razor
Unescape View File

@ -143,7 +143,7 @@
IDialogReference dialog = await _dialog.ShowAsync<MoveLocalLibraryPathDialog>("Move Local Library Path", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<MoveLocalLibraryPathDialog>("Move Local Library Path", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new MoveLocalLibraryPath(libraryPath.Id, library.Id);
Either<BaseError, Unit> moveResult = await _mediator.Send(request, _cts.Token); Either<BaseError, Unit> moveResult = await _mediator.Send(request, _cts.Token);
@ -177,7 +177,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Library Path", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Library Path", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
_model.HasChanges = true; _model.HasChanges = true;
_model.Paths.Remove(libraryPath); _model.Paths.Remove(libraryPath);

2
ErsatzTV/Pages/Movie.razor
Unescape View File

@ -246,7 +246,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); await _mediator.Send(new AddMovieToCollection(collection.Id, MovieId), _cts.Token);
_navigationManager.NavigateTo($"media/collections/{collection.Id}"); _navigationManager.NavigateTo($"media/collections/{collection.Id}");

2
ErsatzTV/Pages/MovieList.razor
Unescape View File

@ -137,7 +137,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddMovieToCollection(collection.Id, movie.MovieId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);

4
ErsatzTV/Pages/MultiSelectBase.cs
Unescape View File

@ -114,7 +114,7 @@ public class MultiSelectBase<T> : FragmentNavigationBase
IDialogReference dialog = await Dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = await Dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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( var request = new AddItemsToCollection(
collection.Id, collection.Id,
@ -155,7 +155,7 @@ public class MultiSelectBase<T> : FragmentNavigationBase
parameters, parameters,
options); options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
var itemIds = SelectedItems.Map(vm => vm.MediaItemId).ToList(); var itemIds = SelectedItems.Map(vm => vm.MediaItemId).ToList();

2
ErsatzTV/Pages/MusicVideoList.razor
Unescape View File

@ -138,7 +138,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddMusicVideoToCollection(collection.Id, musicVideo.MusicVideoId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);

2
ErsatzTV/Pages/OtherVideoList.razor
Unescape View File

@ -138,7 +138,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddOtherVideoToCollection(collection.Id, otherVideo.OtherVideoId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);

2
ErsatzTV/Pages/Playouts.razor
Unescape View File

@ -155,7 +155,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Playout", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Playout", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeletePlayout(playout.PlayoutId), _cts.Token); await _mediator.Send(new DeletePlayout(playout.PlayoutId), _cts.Token);
if (_table != null) if (_table != null)

2
ErsatzTV/Pages/PlexMediaSources.razor
Unescape View File

@ -106,7 +106,7 @@
var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small };
IDialogReference dialog = await _dialog.ShowAsync<SignOutOfPlexDialog>("Sign out of Plex", options); IDialogReference dialog = await _dialog.ShowAsync<SignOutOfPlexDialog>("Sign out of Plex", options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
if (_locker.LockPlex()) if (_locker.LockPlex())
{ {

2
ErsatzTV/Pages/Schedules.razor
Unescape View File

@ -126,7 +126,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Schedule", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Schedule", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteProgramSchedule(programSchedule.Id), _cts.Token); await _mediator.Send(new DeleteProgramSchedule(programSchedule.Id), _cts.Token);
if (_table != null) if (_table != null)

16
ErsatzTV/Pages/Search.razor
Unescape View File

@ -368,7 +368,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddMovieToCollection(collection.Id, movie.MovieId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);
@ -389,7 +389,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddShowToCollection(collection.Id, show.TelevisionShowId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);
@ -410,7 +410,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddEpisodeToCollection(collection.Id, episode.EpisodeId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);
@ -431,7 +431,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddArtistToCollection(collection.Id, artist.ArtistId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);
@ -452,7 +452,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddMusicVideoToCollection(collection.Id, musicVideo.MusicVideoId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);
@ -473,7 +473,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddOtherVideoToCollection(collection.Id, otherVideo.OtherVideoId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);
@ -494,7 +494,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddSongToCollection(collection.Id, song.SongId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);
@ -618,7 +618,7 @@
IDialogReference dialog = Dialog.Show<SaveAsSmartCollectionDialog>("Save As Smart Collection", options); IDialogReference dialog = Dialog.Show<SaveAsSmartCollectionDialog>("Save As Smart Collection", options);
DialogResult result = await dialog.Result; 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( var request = new UpdateSmartCollection(
collection.Id, collection.Id,

2
ErsatzTV/Pages/SongList.razor
Unescape View File

@ -138,7 +138,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddSongToCollection(collection.Id, song.SongId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);

6
ErsatzTV/Pages/TelevisionEpisodeList.razor
Unescape View File

@ -216,7 +216,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); await _mediator.Send(new AddSeasonToCollection(collection.Id, SeasonId), _cts.Token);
_navigationManager.NavigateTo($"media/collections/{collection.Id}"); _navigationManager.NavigateTo($"media/collections/{collection.Id}");
@ -231,7 +231,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToScheduleDialog>("Add To Schedule", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToScheduleDialog>("Add To Schedule", parameters, options);
DialogResult result = await dialog.Result; 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); 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"); _navigationManager.NavigateTo($"schedules/{schedule.Id}/items");
@ -245,7 +245,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddEpisodeToCollection(collection.Id, episode.EpisodeId);
Either<BaseError, Unit> addResult = await _mediator.Send(request, _cts.Token); Either<BaseError, Unit> addResult = await _mediator.Send(request, _cts.Token);

6
ErsatzTV/Pages/TelevisionSeasonList.razor
Unescape View File

@ -212,7 +212,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); await _mediator.Send(new AddShowToCollection(collection.Id, ShowId), _cts.Token);
_navigationManager.NavigateTo($"media/collections/{collection.Id}"); _navigationManager.NavigateTo($"media/collections/{collection.Id}");
@ -226,7 +226,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToScheduleDialog>("Add To Schedule", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToScheduleDialog>("Add To Schedule", parameters, options);
DialogResult result = await dialog.Result; 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); 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"); _navigationManager.NavigateTo($"schedules/{schedule.Id}/items");
@ -242,7 +242,7 @@
IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddSeasonToCollection(collection.Id, season.TelevisionSeasonId);
Either<BaseError, Unit> addResult = await _mediator.Send(request, _cts.Token); Either<BaseError, Unit> addResult = await _mediator.Send(request, _cts.Token);

2
ErsatzTV/Pages/TelevisionSeasonSearchResults.razor
Unescape View File

@ -137,7 +137,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddSeasonToCollection(collection.Id, season.TelevisionSeasonId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);

2
ErsatzTV/Pages/TelevisionShowList.razor
Unescape View File

@ -137,7 +137,7 @@
IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options); IDialogReference dialog = Dialog.Show<AddToCollectionDialog>("Add To Collection", parameters, options);
DialogResult result = await dialog.Result; 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); var request = new AddShowToCollection(collection.Id, show.TelevisionShowId);
Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken); Either<BaseError, Unit> addResult = await Mediator.Send(request, CancellationToken);

4
ErsatzTV/Pages/TraktLists.razor
Unescape View File

@ -117,7 +117,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Trakt List", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Trakt List", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _workerChannel.WriteAsync(new DeleteTraktList(traktList.Id), _cts.Token); await _workerChannel.WriteAsync(new DeleteTraktList(traktList.Id), _cts.Token);
} }
@ -143,7 +143,7 @@
var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small };
IDialogReference dialog = await _dialog.ShowAsync<AddTraktListDialog>("Add Trakt List", options); IDialogReference dialog = await _dialog.ShowAsync<AddTraktListDialog>("Add Trakt List", options);
DialogResult result = await dialog.Result; 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); await _workerChannel.WriteAsync(new AddTraktList(url), _cts.Token);
} }

6
ErsatzTV/Pages/Trash.razor
Unescape View File

@ -484,7 +484,7 @@
IDialogReference dialog = Dialog.Show<DeleteFromDatabaseDialog>("Delete From Database", parameters, options); IDialogReference dialog = Dialog.Show<DeleteFromDatabaseDialog>("Delete From Database", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
var request = new DeleteItemsFromDatabase( var request = new DeleteItemsFromDatabase(
movieIds.Append(showIds) movieIds.Append(showIds)
@ -564,7 +564,7 @@
IDialogReference dialog = Dialog.Show<DeleteFromDatabaseDialog>("Delete From Database", parameters, options); IDialogReference dialog = Dialog.Show<DeleteFromDatabaseDialog>("Delete From Database", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await Mediator.Send(request, CancellationToken); await Mediator.Send(request, CancellationToken);
await RefreshData(); await RefreshData();
@ -581,7 +581,7 @@
IDialogReference dialog = Dialog.Show<DeleteFromDatabaseDialog>("Delete From Database", parameters, options); IDialogReference dialog = Dialog.Show<DeleteFromDatabaseDialog>("Delete From Database", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await Mediator.Send(new EmptyTrash(), CancellationToken); await Mediator.Send(new EmptyTrash(), CancellationToken);
await RefreshData(); await RefreshData();

4
ErsatzTV/Pages/Watermarks.razor
Unescape View File

@ -93,7 +93,7 @@
IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Watermark", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DeleteDialog>("Delete Watermark", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
await _mediator.Send(new DeleteWatermark(watermark.Id), _cts.Token); await _mediator.Send(new DeleteWatermark(watermark.Id), _cts.Token);
await LoadWatermarksAsync(); await LoadWatermarksAsync();
@ -107,7 +107,7 @@
IDialogReference dialog = await _dialog.ShowAsync<CopyWatermarkDialog>("Copy Watermark", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<CopyWatermarkDialog>("Copy Watermark", parameters, options);
DialogResult dialogResult = await dialog.Result; 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}"); _navigationManager.NavigateTo($"/watermarks/{data.Id}");
} }

2
ErsatzTV/Shared/RemoteMediaSources.razor
Unescape View File

@ -121,7 +121,7 @@
var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small }; var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Small };
IDialogReference dialog = await _dialog.ShowAsync<DisconnectRemoteMediaSourceDialog>($"Disconnect {Name}", parameters, options); IDialogReference dialog = await _dialog.ShowAsync<DisconnectRemoteMediaSourceDialog>($"Disconnect {Name}", parameters, options);
DialogResult result = await dialog.Result; DialogResult result = await dialog.Result;
if (!result.Cancelled) if (!result.Canceled)
{ {
if (_locker.LockRemoteMediaSource<TMediaSource>()) if (_locker.LockRemoteMediaSource<TMediaSource>())
{ {

Write Preview
Loading…
Cancel
Save