diff --git a/ErsatzTV.Core/Hdhr/Discover.cs b/ErsatzTV.Core/Hdhr/Discover.cs index bb673dc01..fa75ab1c7 100644 --- a/ErsatzTV.Core/Hdhr/Discover.cs +++ b/ErsatzTV.Core/Hdhr/Discover.cs @@ -25,7 +25,7 @@ public class Discover public string FriendlyName => "ErsatzTV"; public string LineupURL => $"{_scheme}://{_host}/lineup.json"; public string Manufacturer => "ErsatzTV"; - public string ManufacturerURL => "https://github.com/ErsatzTV/ErsatzTV"; + public string ManufacturerURL => "https://github.com/ErsatzTV/legacy"; public string ModelNumber => "HDTC-2US"; public int TunerCount { get; } } diff --git a/ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj b/ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj index e9422ef92..8d68a3643 100644 --- a/ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj +++ b/ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj b/ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj index b47b678be..8c4c014fd 100644 --- a/ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj +++ b/ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj b/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj index 93e5f11ea..ed6cbd389 100644 --- a/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj +++ b/ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj @@ -34,7 +34,7 @@ - + diff --git a/ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj b/ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj index a5187c7bf..320a93af7 100644 --- a/ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj +++ b/ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj @@ -18,7 +18,7 @@ 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 40aa2eb1f..652ad818e 100644 --- a/ErsatzTV/ErsatzTV.csproj +++ b/ErsatzTV/ErsatzTV.csproj @@ -35,7 +35,7 @@ - + @@ -52,7 +52,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/ErsatzTV/Pages/ChannelEditor.razor b/ErsatzTV/Pages/ChannelEditor.razor index d63d73437..cf2dada29 100644 --- a/ErsatzTV/Pages/ChannelEditor.razor +++ b/ErsatzTV/Pages/ChannelEditor.razor @@ -455,7 +455,7 @@ else private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (!_form.IsValid) { return; diff --git a/ErsatzTV/Pages/CollectionEditor.razor b/ErsatzTV/Pages/CollectionEditor.razor index bd4653505..470c7fbc5 100644 --- a/ErsatzTV/Pages/CollectionEditor.razor +++ b/ErsatzTV/Pages/CollectionEditor.razor @@ -74,7 +74,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (_success) { Seq errorMessage = IsEdit ? (await Mediator.Send(new UpdateCollection(Id, _model.Name), _cts.Token)).LeftToSeq() : (await Mediator.Send(new CreateCollection(_model.Name), _cts.Token)).LeftToSeq(); diff --git a/ErsatzTV/Pages/FFmpegEditor.razor b/ErsatzTV/Pages/FFmpegEditor.razor index 67b09f95b..9b3c1c43a 100644 --- a/ErsatzTV/Pages/FFmpegEditor.razor +++ b/ErsatzTV/Pages/FFmpegEditor.razor @@ -470,7 +470,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (!_form.IsValid) { return; diff --git a/ErsatzTV/Pages/FillerPresetEditor.razor b/ErsatzTV/Pages/FillerPresetEditor.razor index 68fbb176b..2178ef6e1 100644 --- a/ErsatzTV/Pages/FillerPresetEditor.razor +++ b/ErsatzTV/Pages/FillerPresetEditor.razor @@ -395,7 +395,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); ValidationResult result = await _validator.ValidateAsync(_model, _cts.Token); if (result.IsValid) { diff --git a/ErsatzTV/Pages/LocalLibraryEditor.razor b/ErsatzTV/Pages/LocalLibraryEditor.razor index 557db584a..27fa0dfe4 100644 --- a/ErsatzTV/Pages/LocalLibraryEditor.razor +++ b/ErsatzTV/Pages/LocalLibraryEditor.razor @@ -229,7 +229,7 @@ private async Task SaveChangesAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (_success) { Either result = IsEdit diff --git a/ErsatzTV/Pages/MultiCollectionEditor.razor b/ErsatzTV/Pages/MultiCollectionEditor.razor index e05e3a8b0..071844ba4 100644 --- a/ErsatzTV/Pages/MultiCollectionEditor.razor +++ b/ErsatzTV/Pages/MultiCollectionEditor.razor @@ -190,7 +190,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (_success) { Seq errorMessage = IsEdit ? (await Mediator.Send(new UpdateMultiCollection(Id, _model.Name, GetUpdateItems()), _cts.Token)).LeftToSeq() : (await Mediator.Send(new CreateMultiCollection(_model.Name, GetCreateItems()), _cts.Token)).LeftToSeq(); diff --git a/ErsatzTV/Pages/PlayoutEditor.razor b/ErsatzTV/Pages/PlayoutEditor.razor index 962bf599b..dcaf5da52 100644 --- a/ErsatzTV/Pages/PlayoutEditor.razor +++ b/ErsatzTV/Pages/PlayoutEditor.razor @@ -131,7 +131,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); ValidationResult result = await _validator.ValidateAsync(_model, _cts.Token); if (result.IsValid) { diff --git a/ErsatzTV/Pages/RerunCollectionEditor.razor b/ErsatzTV/Pages/RerunCollectionEditor.razor index 55de44f0f..1feaac209 100644 --- a/ErsatzTV/Pages/RerunCollectionEditor.razor +++ b/ErsatzTV/Pages/RerunCollectionEditor.razor @@ -329,7 +329,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (_success) { Seq errorMessage = IsEdit diff --git a/ErsatzTV/Pages/ScheduleEditor.razor b/ErsatzTV/Pages/ScheduleEditor.razor index db302b2f3..3bd0c5be0 100644 --- a/ErsatzTV/Pages/ScheduleEditor.razor +++ b/ErsatzTV/Pages/ScheduleEditor.razor @@ -123,7 +123,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (_success) { Either result = IsEdit diff --git a/ErsatzTV/Pages/ScheduleItemsEditor.razor b/ErsatzTV/Pages/ScheduleItemsEditor.razor index dff1d384f..dbe3fa7f9 100644 --- a/ErsatzTV/Pages/ScheduleItemsEditor.razor +++ b/ErsatzTV/Pages/ScheduleItemsEditor.razor @@ -1064,7 +1064,7 @@ private async Task SaveChanges() { - await _form.Validate(); + await _form.ValidateAsync(); if (!_success) { return; diff --git a/ErsatzTV/Pages/Settings/FFmpegSettings.razor b/ErsatzTV/Pages/Settings/FFmpegSettings.razor index 45990d24b..748dc904c 100644 --- a/ErsatzTV/Pages/Settings/FFmpegSettings.razor +++ b/ErsatzTV/Pages/Settings/FFmpegSettings.razor @@ -229,7 +229,7 @@ private async Task SaveFFmpegSettings() { - await _form.Validate(); + await _form.ValidateAsync(); if (_success) { Either result = await Mediator.Send(new UpdateFFmpegSettings(_ffmpegSettings), _cts.Token); diff --git a/ErsatzTV/Pages/Settings/HDHRSettings.razor b/ErsatzTV/Pages/Settings/HDHRSettings.razor index bd271ab92..2a032ef82 100644 --- a/ErsatzTV/Pages/Settings/HDHRSettings.razor +++ b/ErsatzTV/Pages/Settings/HDHRSettings.razor @@ -69,7 +69,7 @@ private async Task SaveHDHRSettings() { - await _form.Validate(); + await _form.ValidateAsync(); if (_hdhrSuccess) { Either result = await Mediator.Send(new UpdateHDHRTunerCount(_tunerCount), _cts.Token); diff --git a/ErsatzTV/Pages/Settings/PlayoutSettings.razor b/ErsatzTV/Pages/Settings/PlayoutSettings.razor index e93a395ae..4b90e3869 100644 --- a/ErsatzTV/Pages/Settings/PlayoutSettings.razor +++ b/ErsatzTV/Pages/Settings/PlayoutSettings.razor @@ -74,7 +74,7 @@ private async Task SavePlayoutSettings() { - await _form.Validate(); + await _form.ValidateAsync(); if (_playoutSuccess) { Either result = await Mediator.Send(new UpdatePlayoutSettings(_playoutSettings), _cts.Token); diff --git a/ErsatzTV/Pages/Settings/ScannerSettings.razor b/ErsatzTV/Pages/Settings/ScannerSettings.razor index 2f81323f4..6dd43bed8 100644 --- a/ErsatzTV/Pages/Settings/ScannerSettings.razor +++ b/ErsatzTV/Pages/Settings/ScannerSettings.razor @@ -63,7 +63,7 @@ private async Task SaveScannerSettings() { - await _form.Validate(); + await _form.ValidateAsync(); if (_scannerSuccess) { Either result = await Mediator.Send(new UpdateLibraryRefreshInterval(_libraryRefreshInterval), _cts.Token); diff --git a/ErsatzTV/Pages/SmartCollectionEditor.razor b/ErsatzTV/Pages/SmartCollectionEditor.razor index 05464e1c2..dd564fff4 100644 --- a/ErsatzTV/Pages/SmartCollectionEditor.razor +++ b/ErsatzTV/Pages/SmartCollectionEditor.razor @@ -67,7 +67,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (_success) { Either result = await Mediator.Send(new UpdateSmartCollection(Id, _model.Name, _model.Query), _cts.Token); diff --git a/ErsatzTV/Pages/TraktListEditor.razor b/ErsatzTV/Pages/TraktListEditor.razor index 639bc2ccd..198d31d35 100644 --- a/ErsatzTV/Pages/TraktListEditor.razor +++ b/ErsatzTV/Pages/TraktListEditor.razor @@ -86,7 +86,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (_success) { var request = new UpdateTraktList(_model.Id, _model.AutoRefresh, _model.GeneratePlaylist); diff --git a/ErsatzTV/Pages/Troubleshooting/PlaybackTroubleshooting.razor b/ErsatzTV/Pages/Troubleshooting/PlaybackTroubleshooting.razor index c77676d26..1da28ef7b 100644 --- a/ErsatzTV/Pages/Troubleshooting/PlaybackTroubleshooting.razor +++ b/ErsatzTV/Pages/Troubleshooting/PlaybackTroubleshooting.razor @@ -205,8 +205,8 @@ private int _ffmpegProfileId; private bool _channelMode; private string _streamSelector; - private IEnumerable _watermarkNames = new System.Collections.Generic.HashSet(); - private IEnumerable _graphicsElementNames = new System.Collections.Generic.HashSet(); + private IReadOnlyCollection _watermarkNames = new System.Collections.Generic.HashSet(); + private IReadOnlyCollection _graphicsElementNames = new System.Collections.Generic.HashSet(); private bool _startFromBeginning; private int? _subtitleId; private int _seekSeconds; @@ -292,7 +292,7 @@ private async Task PreviewChannel() { - await _logsField.SetText(string.Empty); + await _logsField.SetTextAsync(string.Empty); _lastSpeed = null; var baseUri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri).ToString(); @@ -421,7 +421,7 @@ private async Task HandleTroubleshootingCompleted(PlaybackTroubleshootingCompletedNotification result) { - await InvokeAsync(async () => { await _logsField.SetText(string.Empty); }); + await InvokeAsync(async () => { await _logsField.SetTextAsync(string.Empty); }); _lastSpeed = null; foreach (double speed in result.MaybeSpeed) @@ -442,14 +442,14 @@ if (FileSystem.File.Exists(logFileName)) { string text = await File.ReadAllTextAsync(logFileName); - await InvokeAsync(async () => { await _logsField.SetText(text); }); + await InvokeAsync(async () => { await _logsField.SetTextAsync(text); }); } else { foreach (var exception in result.MaybeException) { string text = exception.Message + Environment.NewLine + Environment.NewLine + exception; - await InvokeAsync(async () => { await _logsField.SetText(text); }); + await InvokeAsync(async () => { await _logsField.SetTextAsync(text); }); } } } diff --git a/ErsatzTV/Pages/WatermarkEditor.razor b/ErsatzTV/Pages/WatermarkEditor.razor index a52a99d10..c4b44f928 100644 --- a/ErsatzTV/Pages/WatermarkEditor.razor +++ b/ErsatzTV/Pages/WatermarkEditor.razor @@ -265,7 +265,7 @@ private async Task HandleSubmitAsync() { - await _form.Validate(); + await _form.ValidateAsync(); if (!_form.IsValid) { return; diff --git a/ErsatzTV/Shared/MainLayout.razor b/ErsatzTV/Shared/MainLayout.razor index 1373fd51e..b0c2c5e57 100644 --- a/ErsatzTV/Shared/MainLayout.razor +++ b/ErsatzTV/Shared/MainLayout.razor @@ -102,7 +102,7 @@ - +
diff --git a/ErsatzTV/ViewModels/BlockItemEditViewModel.cs b/ErsatzTV/ViewModels/BlockItemEditViewModel.cs index e49061705..c04bf940c 100644 --- a/ErsatzTV/ViewModels/BlockItemEditViewModel.cs +++ b/ErsatzTV/ViewModels/BlockItemEditViewModel.cs @@ -71,9 +71,9 @@ public class BlockItemEditViewModel : INotifyPropertyChanged public bool DisableWatermarks { get; set; } - public IEnumerable Watermarks { get; set; } + public IReadOnlyCollection Watermarks { get; set; } - public IEnumerable GraphicsElements { get; set; } + public IReadOnlyCollection GraphicsElements { get; set; } public event PropertyChangedEventHandler PropertyChanged; diff --git a/ErsatzTV/ViewModels/DecoEditViewModel.cs b/ErsatzTV/ViewModels/DecoEditViewModel.cs index ab28d6cb2..cb63eba5c 100644 --- a/ErsatzTV/ViewModels/DecoEditViewModel.cs +++ b/ErsatzTV/ViewModels/DecoEditViewModel.cs @@ -13,11 +13,11 @@ public class DecoEditViewModel public string GroupName { get; set; } public string Name { get; set; } public DecoMode WatermarkMode { get; set; } - public IEnumerable Watermarks { get; set; } + public IReadOnlyCollection Watermarks { get; set; } public bool UseWatermarkDuringFiller { get; set; } public DecoMode GraphicsElementsMode { get; set; } - public IEnumerable GraphicsElements { get; set; } + public IReadOnlyCollection GraphicsElements { get; set; } public bool UseGraphicsElementsDuringFiller { get; set; } public DecoMode DefaultFillerMode { get; set; } diff --git a/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs b/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs index ff1dc7913..b9d0a784a 100644 --- a/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs +++ b/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs @@ -110,8 +110,8 @@ public class ProgramScheduleItemEditViewModel : INotifyPropertyChanged public FillerPresetViewModel PostRollFiller { get; set; } public FillerPresetViewModel TailFiller { get; set; } public FillerPresetViewModel FallbackFiller { get; set; } - public IEnumerable Watermarks { get; set; } - public IEnumerable GraphicsElements { get; set; } + public IReadOnlyCollection Watermarks { get; set; } + public IReadOnlyCollection GraphicsElements { get; set; } public string PreferredAudioLanguageCode { get; set; } public string PreferredAudioTitle { get; set; } public string PreferredSubtitleLanguageCode { get; set; }