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

use new form layout for channel editor (#2112)

pull/2113/head
Jason Dove 1 month ago committed by GitHub
parent
93afcd2f57
commit
aff4fb0deb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 247 additions and 157 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. 4
      CHANGELOG.md
  2. 1
      ErsatzTV.Application/ErsatzTV.Application.csproj.DotSettings
  3. 2
      ErsatzTV.Application/Validators/GetMemberName.cs
  4. 2
      ErsatzTV.Application/Validators/NumericValidation.cs
  5. 2
      ErsatzTV.Application/Validators/StringValidation.cs
  6. 384
      ErsatzTV/Pages/ChannelEditor.razor
  7. 9
      ErsatzTV/Validators/ChannelEditViewModelValidator.cs

4
CHANGELOG.md
Unescape View File

@ -72,7 +72,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Remove some limits on multithreading that are no longer needed with latest ffmpeg - Remove some limits on multithreading that are no longer needed with latest ffmpeg
- Mixed transcoding (software decode, hardware filters/encode) can now use multiple decode threads - Mixed transcoding (software decode, hardware filters/encode) can now use multiple decode threads
- Split main `Settings` page into multiple pages - Split main `Settings` page into multiple pages
- Update layout on all new settings pages to be less cramped and to work better on mobile - Update form layout to be less cramped and to work better on mobile
- All new (split) settings pages
- Channel editor
### Fixed ### Fixed
- Fix QSV acceleration in docker with older Intel devices - Fix QSV acceleration in docker with older Intel devices

1
ErsatzTV.Application/ErsatzTV.Application.csproj.DotSettings
Unescape View File

@ -44,5 +44,6 @@
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=subtitles_005Ccommands/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=subtitles_005Ccommands/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=television_005Cqueries/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=television_005Cqueries/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=templates_005Cqueries/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=templates_005Cqueries/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=validators/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=watermarks_005Ccommands/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=watermarks_005Ccommands/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=watermarks_005Cqueries/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary> <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=watermarks_005Cqueries/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

2
ErsatzTV.Application/Validators/GetMemberName.cs
Unescape View File

@ -1,7 +1,7 @@
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
namespace ErsatzTV; namespace ErsatzTV.Application;
public static partial class Validators public static partial class Validators
{ {

2
ErsatzTV.Application/Validators/NumericValidation.cs
Unescape View File

@ -1,7 +1,7 @@
using System.Linq.Expressions; using System.Linq.Expressions;
using ErsatzTV.Core; using ErsatzTV.Core;
namespace ErsatzTV; namespace ErsatzTV.Application;
public static partial class Validators public static partial class Validators
{ {

2
ErsatzTV.Application/Validators/StringValidation.cs
Unescape View File

@ -1,7 +1,7 @@
using System.Linq.Expressions; using System.Linq.Expressions;
using ErsatzTV.Core; using ErsatzTV.Core;
namespace ErsatzTV; namespace ErsatzTV.Application;
public static partial class Validators public static partial class Validators
{ {

384
ErsatzTV/Pages/ChannelEditor.razor
Unescape View File

@ -1,6 +1,5 @@
@page "/channels/{Id:int?}" @page "/channels/{Id:int?}"
@page "/channels/add" @page "/channels/add"
@using System.Net
@using ErsatzTV.Application.Artworks @using ErsatzTV.Application.Artworks
@using ErsatzTV.Application.Channels @using ErsatzTV.Application.Channels
@using ErsatzTV.Application.FFmpegProfiles @using ErsatzTV.Application.FFmpegProfiles
@ -10,6 +9,8 @@
@using ErsatzTV.Application.Templates @using ErsatzTV.Application.Templates
@using ErsatzTV.Application.Watermarks @using ErsatzTV.Application.Watermarks
@using ErsatzTV.Core.Domain.Filler @using ErsatzTV.Core.Domain.Filler
@using ErsatzTV.Validators
@using FluentValidation.Results
@using static Prelude @using static Prelude
@implements IDisposable @implements IDisposable
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager
@ -17,161 +18,243 @@
@inject ISnackbar Snackbar @inject ISnackbar Snackbar
@inject IMediator Mediator @inject IMediator Mediator
<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8"> <MudForm Model="@_model" @ref="@_form" Validation="@(_validator.ValidateValue)" ValidationDelay="0" Style="max-height: 100%">
<div style="max-width: 400px;"> <MudPaper Square="true" Style="display: flex; height: 64px; min-height: 64px; width: 100%; z-index: 100; align-items: center">
<EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync"> <MudButton Variant="Variant.Filled" Color="Color.Primary" Class="ml-8" OnClick="HandleSubmitAsync" StartIcon="@(IsEdit ? Icons.Material.Filled.Save : Icons.Material.Filled.Add)">@(IsEdit ? "Save Changes" : "Add Channel")</MudButton>
<FluentValidationValidator/> </MudPaper>
<MudCard> <div class="d-flex flex-column" style="height: 100vh; overflow-x: auto">
<MudCardHeader> <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
<CardHeaderContent> <MudText Typo="Typo.h5" Class="mb-2">@(IsEdit ? "Edit Channel" : "Add Channel")</MudText>
<MudText Typo="Typo.h5">@(IsEdit ? "Edit Channel" : "Add Channel")</MudText> <MudDivider Class="mb-6"/>
</CardHeaderContent> <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
</MudCardHeader> <div class="d-flex justify-md-end">
<MudCardContent> <MudText>Number</MudText>
<MudTextField Label="Number" @bind-Value="_model.Number" For="@(() => _model.Number)" Immediate="true"/> </div>
<MudTextField Class="mt-3" Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/> <MudTextField @bind-Value="_model.Number" For="@(() => _model.Number)" Immediate="true"/>
<MudTextField Class="mt-3" Label="Group" @bind-Value="_model.Group" For="@(() => _model.Group)"/> </MudStack>
<MudTextField Class="mt-3" Label="Categories" @bind-Value="_model.Categories" For="@(() => _model.Categories)" Placeholder="Comma-separated list of categories"/> <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<MudSelect Class="mt-3" Label="Active Mode" @bind-Value="_model.ActiveMode" For="@(() => _model.ActiveMode)"> <div class="d-flex justify-md-end">
<MudSelectItem Value="@(ChannelActiveMode.Active)">Active</MudSelectItem> <MudText>Name</MudText>
<MudSelectItem Value="@(ChannelActiveMode.Hidden)">Hidden</MudSelectItem> </div>
<MudSelectItem Value="@(ChannelActiveMode.Inactive)">Inactive</MudSelectItem> <MudTextField @bind-Value="_model.Name" For="@(() => _model.Name)"/>
</MudSelect> </MudStack>
<MudSelect Class="mt-3" Label="Progress Mode" @bind-Value="_model.ProgressMode" For="@(() => _model.ProgressMode)"> <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<MudSelectItem Value="@(ChannelProgressMode.Always)">Always</MudSelectItem> <div class="d-flex justify-md-end">
<MudSelectItem Value="@(ChannelProgressMode.OnDemand)">On Demand</MudSelectItem> <MudText>Group</MudText>
</MudSelect> </div>
<MudSelect Class="mt-3" Label="Streaming Mode" @bind-Value="_model.StreamingMode" For="@(() => _model.StreamingMode)"> <MudTextField @bind-Value="_model.Group" For="@(() => _model.Group)"/>
<MudSelectItem Value="@(StreamingMode.TransportStreamHybrid)">MPEG-TS</MudSelectItem> </MudStack>
<MudSelectItem Value="@(StreamingMode.TransportStream)">MPEG-TS (Legacy)</MudSelectItem> <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<MudSelectItem Value="@(StreamingMode.HttpLiveStreamingDirect)">HLS Direct</MudSelectItem> <div class="d-flex justify-md-end">
<MudSelectItem Value="@(StreamingMode.HttpLiveStreamingSegmenter)">HLS Segmenter</MudSelectItem> <MudText>Categories</MudText>
<MudSelectItem Value="@(StreamingMode.HttpLiveStreamingSegmenterV2)">HLS Segmenter V2</MudSelectItem> </div>
</MudSelect> <MudTextField @bind-Value="_model.Categories" For="@(() => _model.Categories)" HelperText="Comma-separated list of categories"/>
<MudSelect Class="mt-3" Label="FFmpeg Profile" @bind-Value="_model.FFmpegProfileId" For="@(() => _model.FFmpegProfileId)" </MudStack>
Disabled="@(_model.StreamingMode == StreamingMode.HttpLiveStreamingDirect)"> <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
@foreach (FFmpegProfileViewModel profile in _ffmpegProfiles) <div class="d-flex justify-md-end">
{ <MudText>Active Mode</MudText>
<MudSelectItem Value="@profile.Id">@profile.Name</MudSelectItem> </div>
} <MudSelect @bind-Value="_model.ActiveMode" For="@(() => _model.ActiveMode)">
</MudSelect> <MudSelectItem Value="@(ChannelActiveMode.Active)">Active</MudSelectItem>
<MudSelect Class="mt-3" Label="Stream Selector Mode" @bind-Value="_model.StreamSelectorMode" For="@(() => _model.StreamSelectorMode)"> <MudSelectItem Value="@(ChannelActiveMode.Hidden)">Hidden</MudSelectItem>
<MudSelectItem Value="@(ChannelStreamSelectorMode.Default)">Default</MudSelectItem> <MudSelectItem Value="@(ChannelActiveMode.Inactive)">Inactive</MudSelectItem>
<MudSelectItem Value="@(ChannelStreamSelectorMode.Custom)">Custom</MudSelectItem> </MudSelect>
</MudSelect> </MudStack>
@if (_model.StreamSelectorMode is ChannelStreamSelectorMode.Default) <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Progress Mode</MudText>
</div>
<MudSelect @bind-Value="_model.ProgressMode" For="@(() => _model.ProgressMode)">
<MudSelectItem Value="@(ChannelProgressMode.Always)">Always</MudSelectItem>
<MudSelectItem Value="@(ChannelProgressMode.OnDemand)">On Demand</MudSelectItem>
</MudSelect>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Streaming Mode</MudText>
</div>
<MudSelect @bind-Value="_model.StreamingMode" For="@(() => _model.StreamingMode)">
<MudSelectItem Value="@(StreamingMode.TransportStreamHybrid)">MPEG-TS</MudSelectItem>
<MudSelectItem Value="@(StreamingMode.TransportStream)">MPEG-TS (Legacy)</MudSelectItem>
<MudSelectItem Value="@(StreamingMode.HttpLiveStreamingDirect)">HLS Direct</MudSelectItem>
<MudSelectItem Value="@(StreamingMode.HttpLiveStreamingSegmenter)">HLS Segmenter</MudSelectItem>
<MudSelectItem Value="@(StreamingMode.HttpLiveStreamingSegmenterV2)">HLS Segmenter V2</MudSelectItem>
</MudSelect>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>FFmpeg Profile</MudText>
</div>
<MudSelect @bind-Value="_model.FFmpegProfileId" For="@(() => _model.FFmpegProfileId)"
Disabled="@(_model.StreamingMode == StreamingMode.HttpLiveStreamingDirect)">
@foreach (FFmpegProfileViewModel profile in _ffmpegProfiles)
{ {
<MudSelect Class="mt-3" <MudSelectItem Value="@profile.Id">@profile.Name</MudSelectItem>
Label="Preferred Audio Language"
@bind-Value="_model.PreferredAudioLanguageCode"
For="@(() => _model.PreferredAudioLanguageCode)"
Clearable="true">
<MudSelectItem Value="@((string)null)">(none)</MudSelectItem>
@foreach (LanguageCodeViewModel culture in _availableCultures)
{
<MudSelectItem Value="@culture.ThreeLetterISOLanguageName">@culture.EnglishName</MudSelectItem>
}
</MudSelect>
<MudTextField Label="Preferred Audio Title" @bind-Value="_model.PreferredAudioTitle" For="@(() => _model.PreferredAudioTitle)"/>
<MudSelect Class="mt-3"
Label="Preferred Subtitle Language"
@bind-Value="_model.PreferredSubtitleLanguageCode"
For="@(() => _model.PreferredSubtitleLanguageCode)"
Clearable="true">
<MudSelectItem Value="@((string)null)">(none)</MudSelectItem>
@foreach (LanguageCodeViewModel culture in _availableCultures)
{
<MudSelectItem Value="@culture.ThreeLetterISOLanguageName">@culture.EnglishName</MudSelectItem>
}
</MudSelect>
<MudSelect Class="mt-3" Label="Subtitle Mode" @bind-Value="_model.SubtitleMode" For="@(() => _model.SubtitleMode)">
<MudSelectItem Value="@(ChannelSubtitleMode.None)">None</MudSelectItem>
<MudSelectItem Value="@(ChannelSubtitleMode.Forced)">Forced</MudSelectItem>
<MudSelectItem Value="@(ChannelSubtitleMode.Default)">Default</MudSelectItem>
<MudSelectItem Value="@(ChannelSubtitleMode.Any)">Any</MudSelectItem>
</MudSelect>
} }
else </MudSelect>
{ </MudStack>
<MudSelect Class="mt-3" <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
Label="Stream Selector" <div class="d-flex justify-md-end">
@bind-Value="_model.StreamSelector" <MudText>Stream Selector Mode</MudText>
For="@(() => _model.StreamSelector)"> </div>
<MudSelectItem T="string" Value="@((string)null)">(none)</MudSelectItem> <MudSelect @bind-Value="_model.StreamSelectorMode" For="@(() => _model.StreamSelectorMode)">
@foreach (string selector in _streamSelectors) <MudSelectItem Value="@(ChannelStreamSelectorMode.Default)">Default</MudSelectItem>
{ <MudSelectItem Value="@(ChannelStreamSelectorMode.Custom)">Custom</MudSelectItem>
<MudSelectItem T="string" Value="@selector">@selector</MudSelectItem> </MudSelect>
} </MudStack>
</MudSelect> @if (_model.StreamSelectorMode is ChannelStreamSelectorMode.Default)
} {
<MudSelect Class="mt-3" Label="Music Video Credits Mode" @bind-Value="_model.MusicVideoCreditsMode" For="@(() => _model.MusicVideoCreditsMode)"> <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<MudSelectItem Value="@(ChannelMusicVideoCreditsMode.None)">None</MudSelectItem> <div class="d-flex justify-md-end">
<MudSelectItem Value="@(ChannelMusicVideoCreditsMode.GenerateSubtitles)">Generate Subtitles</MudSelectItem> <MudText>Preferred Audio Language</MudText>
</MudSelect> </div>
<MudSelect Class="mt-3" <MudSelect @bind-Value="_model.PreferredAudioLanguageCode"
Label="Music Video Credits Template" For="@(() => _model.PreferredAudioLanguageCode)"
@bind-Value="_model.MusicVideoCreditsTemplate" Clearable="true">
For="@(() => _model.MusicVideoCreditsTemplate)" <MudSelectItem Value="@((string)null)">(none)</MudSelectItem>
Disabled="@(_model.MusicVideoCreditsMode != ChannelMusicVideoCreditsMode.GenerateSubtitles)"> @foreach (LanguageCodeViewModel culture in _availableCultures)
<MudSelectItem T="string" Value="@((string)null)">(none)</MudSelectItem>
@foreach (string template in _musicVideoCreditsTemplates)
{ {
<MudSelectItem T="string" Value="@template">@template</MudSelectItem> <MudSelectItem Value="@culture.ThreeLetterISOLanguageName">@culture.EnglishName</MudSelectItem>
} }
</MudSelect> </MudSelect>
<MudSelect Class="mt-3" Label="Song Video Mode" @bind-Value="_model.SongVideoMode" For="@(() => _model.SongVideoMode)"> </MudStack>
<MudSelectItem Value="@(ChannelSongVideoMode.Default)">Default</MudSelectItem> <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<MudSelectItem Value="@(ChannelSongVideoMode.WithProgress)">With Progress</MudSelectItem> <div class="d-flex justify-md-end">
</MudSelect> <MudText>Preferred Audio Title</MudText>
<MudGrid Class="mt-3" Style="align-items: center" Justify="Justify.Center"> </div>
<MudItem xs="6"> <MudTextField @bind-Value="_model.PreferredAudioTitle" For="@(() => _model.PreferredAudioTitle)"/>
<InputFile id="fileInput" OnChange="UploadLogo" hidden/> </MudStack>
@if (!string.IsNullOrWhiteSpace(_model.Logo?.Path) || !string.IsNullOrWhiteSpace(_model.ExternalLogoUrl)) <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
{ <div class="d-flex justify-md-end">
<MudElement HtmlTag="img" src="@(string.IsNullOrWhiteSpace(_model.ExternalLogoUrl) ? _model.Logo.UrlWithContentType : _model.ExternalLogoUrl)" Style="max-height: 50px"/> <MudText>Preferred Subtitle Language</MudText>
} </div>
</MudItem> <MudSelect @bind-Value="_model.PreferredSubtitleLanguageCode"
<MudItem xs="6"> For="@(() => _model.PreferredSubtitleLanguageCode)"
<MudButton Class="ml-auto" HtmlTag="label"
Variant="Variant.Filled"
Color="Color.Primary"
StartIcon="@Icons.Material.Filled.CloudUpload"
for="fileInput">
Upload Logo
</MudButton>
</MudItem>
</MudGrid>
<MudTextField Label="External Logo URL" @bind-Value="_model.ExternalLogoUrl" For="@(() => _model.ExternalLogoUrl)"/>
<MudSelect Class="mt-3" Label="Watermark" @bind-Value="_model.WatermarkId" For="@(() => _model.WatermarkId)"
Disabled="@(_model.StreamingMode == StreamingMode.HttpLiveStreamingDirect)"
Clearable="true"> Clearable="true">
<MudSelectItem T="int?" Value="@((int?)null)">(none)</MudSelectItem> <MudSelectItem Value="@((string)null)">(none)</MudSelectItem>
@foreach (WatermarkViewModel watermark in _watermarks) @foreach (LanguageCodeViewModel culture in _availableCultures)
{ {
<MudSelectItem T="int?" Value="@watermark.Id">@watermark.Name</MudSelectItem> <MudSelectItem Value="@culture.ThreeLetterISOLanguageName">@culture.EnglishName</MudSelectItem>
} }
</MudSelect> </MudSelect>
<MudSelect Class="mt-3" </MudStack>
Label="Fallback Filler" <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
@bind-Value="_model.FallbackFillerId" <div class="d-flex justify-md-end">
For="@(() => _model.FallbackFillerId)" <MudText>Subtitle Mode</MudText>
Clearable="true"> </div>
<MudSelectItem T="int?" Value="@((int?)null)">(none)</MudSelectItem> <MudSelect @bind-Value="_model.SubtitleMode" For="@(() => _model.SubtitleMode)">
@foreach (FillerPresetViewModel fillerPreset in _fillerPresets) <MudSelectItem Value="@(ChannelSubtitleMode.None)">None</MudSelectItem>
<MudSelectItem Value="@(ChannelSubtitleMode.Forced)">Forced</MudSelectItem>
<MudSelectItem Value="@(ChannelSubtitleMode.Default)">Default</MudSelectItem>
<MudSelectItem Value="@(ChannelSubtitleMode.Any)">Any</MudSelectItem>
</MudSelect>
</MudStack>
}
else
{
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Stream Selector</MudText>
</div>
<MudSelect @bind-Value="_model.StreamSelector"
For="@(() => _model.StreamSelector)">
<MudSelectItem T="string" Value="@((string)null)">(none)</MudSelectItem>
@foreach (string selector in _streamSelectors)
{ {
<MudSelectItem T="int?" Value="@fillerPreset.Id">@fillerPreset.Name</MudSelectItem> <MudSelectItem T="string" Value="@selector">@selector</MudSelectItem>
} }
</MudSelect> </MudSelect>
</MudCardContent> </MudStack>
<MudCardActions> }
<MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary"> <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
@(IsEdit ? "Save Changes" : "Add Channel") <div class="d-flex justify-md-end">
</MudButton> <MudText>Music Video Credits Mode</MudText>
</MudCardActions> </div>
</MudCard> <MudSelect @bind-Value="_model.MusicVideoCreditsMode" For="@(() => _model.MusicVideoCreditsMode)">
</EditForm> <MudSelectItem Value="@(ChannelMusicVideoCreditsMode.None)">None</MudSelectItem>
<MudSelectItem Value="@(ChannelMusicVideoCreditsMode.GenerateSubtitles)">Generate Subtitles</MudSelectItem>
</MudSelect>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Music Video Credits Template</MudText>
</div>
<MudSelect @bind-Value="_model.MusicVideoCreditsTemplate"
For="@(() => _model.MusicVideoCreditsTemplate)"
Disabled="@(_model.MusicVideoCreditsMode != ChannelMusicVideoCreditsMode.GenerateSubtitles)">
<MudSelectItem T="string" Value="@((string)null)">(none)</MudSelectItem>
@foreach (string template in _musicVideoCreditsTemplates)
{
<MudSelectItem T="string" Value="@template">@template</MudSelectItem>
}
</MudSelect>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Song Video Mode</MudText>
</div>
<MudSelect @bind-Value="_model.SongVideoMode" For="@(() => _model.SongVideoMode)">
<MudSelectItem Value="@(ChannelSongVideoMode.Default)">Default</MudSelectItem>
<MudSelectItem Value="@(ChannelSongVideoMode.WithProgress)">With Progress</MudSelectItem>
</MudSelect>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Logo</MudText>
</div>
<InputFile id="fileInput" OnChange="UploadLogo" hidden/>
<MudButton HtmlTag="label"
Variant="Variant.Filled"
Color="Color.Primary"
StartIcon="@Icons.Material.Filled.CloudUpload"
for="fileInput">
Upload Logo
</MudButton>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>External Logo URL</MudText>
</div>
<MudTextField @bind-Value="_model.ExternalLogoUrl" For="@(() => _model.ExternalLogoUrl)"/>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Logo Preview</MudText>
</div>
@if (!string.IsNullOrWhiteSpace(_model.Logo?.Path) || !string.IsNullOrWhiteSpace(_model.ExternalLogoUrl))
{
<MudElement HtmlTag="img" src="@(string.IsNullOrWhiteSpace(_model.ExternalLogoUrl) ? _model.Logo.UrlWithContentType : _model.ExternalLogoUrl)" Style="max-height: 50px"/>
}
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Watermark</MudText>
</div>
<MudSelect @bind-Value="_model.WatermarkId" For="@(() => _model.WatermarkId)"
Disabled="@(_model.StreamingMode == StreamingMode.HttpLiveStreamingDirect)"
Clearable="true">
<MudSelectItem T="int?" Value="@((int?)null)">(none)</MudSelectItem>
@foreach (WatermarkViewModel watermark in _watermarks)
{
<MudSelectItem T="int?" Value="@watermark.Id">@watermark.Name</MudSelectItem>
}
</MudSelect>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex justify-md-end">
<MudText>Fallback Filler</MudText>
</div>
<MudSelect @bind-Value="_model.FallbackFillerId" For="@(() => _model.FallbackFillerId)" Clearable="true">
<MudSelectItem T="int?" Value="@((int?)null)">(none)</MudSelectItem>
@foreach (FillerPresetViewModel fillerPreset in _fillerPresets)
{
<MudSelectItem T="int?" Value="@fillerPreset.Id">@fillerPreset.Name</MudSelectItem>
}
</MudSelect>
</MudStack>
</MudContainer>
</div> </div>
</MudContainer> </MudForm>
@code { @code {
private readonly CancellationTokenSource _cts = new(); private readonly CancellationTokenSource _cts = new();
@ -180,8 +263,8 @@
public int? Id { get; set; } public int? Id { get; set; }
private readonly ChannelEditViewModel _model = new(); private readonly ChannelEditViewModel _model = new();
private EditContext _editContext; private readonly ChannelEditViewModelValidator _validator = new();
private ValidationMessageStore _messageStore; private MudForm _form;
private List<FFmpegProfileViewModel> _ffmpegProfiles = []; private List<FFmpegProfileViewModel> _ffmpegProfiles = [];
private List<LanguageCodeViewModel> _availableCultures = []; private List<LanguageCodeViewModel> _availableCultures = [];
@ -260,12 +343,6 @@
} }
} }
protected override void OnInitialized()
{
_editContext = new EditContext(_model);
_messageStore = new ValidationMessageStore(_editContext);
}
private bool IsEdit => Id.HasValue; private bool IsEdit => Id.HasValue;
private async Task LoadFFmpegProfiles(CancellationToken cancellationToken) => private async Task LoadFFmpegProfiles(CancellationToken cancellationToken) =>
@ -286,8 +363,9 @@
private async Task HandleSubmitAsync() private async Task HandleSubmitAsync()
{ {
_messageStore.Clear(); await _form.Validate();
if (_editContext.Validate()) ValidationResult result = await _validator.ValidateAsync(_model, _cts.Token);
if (result.IsValid)
{ {
Seq<BaseError> errorMessage = IsEdit ? (await Mediator.Send(_model.ToUpdate(), _cts.Token)).LeftToSeq() : (await Mediator.Send(_model.ToCreate(), _cts.Token)).LeftToSeq(); Seq<BaseError> errorMessage = IsEdit ? (await Mediator.Send(_model.ToUpdate(), _cts.Token)).LeftToSeq() : (await Mediator.Send(_model.ToCreate(), _cts.Token)).LeftToSeq();

9
ErsatzTV/Validators/ChannelEditViewModelValidator.cs
Unescape View File

@ -1,6 +1,7 @@
using ErsatzTV.Core.Domain; using ErsatzTV.Core.Domain;
using ErsatzTV.ViewModels; using ErsatzTV.ViewModels;
using FluentValidation; using FluentValidation;
using FluentValidation.Results;
namespace ErsatzTV.Validators; namespace ErsatzTV.Validators;
@ -24,4 +25,12 @@ public class ChannelEditViewModelValidator : AbstractValidator<ChannelEditViewMo
.WithMessage("External logo url is invalid"); .WithMessage("External logo url is invalid");
}); });
} }
public Func<object, string, Task<IEnumerable<string>>> ValidateValue => async (model, propertyName) =>
{
ValidationResult result = await ValidateAsync(ValidationContext<ChannelEditViewModel>.CreateWithOptions((ChannelEditViewModel)model, x => x.IncludeProperties(propertyName)));
if (result.IsValid)
return [];
return result.Errors.Select(e => e.ErrorMessage);
};
} }

Write Preview
Loading…
Cancel
Save