timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

add mid-roll filler expression (#2138)

Browse Source
This commit is contained in:
Jason Dove
2025-07-12 01:23:16 +00:00
committed by GitHub
parent e0df454ac6
commit e16cb30ab1
19 changed files with 12226 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV/Pages/FillerPresetEditor.razor
+28
View File
@@ -178,6 +178,33 @@
</MudSelect>
</MudStack>
}
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
<div class="d-flex">
<MudText>Expression</MudText>
</div>
<MudTextField @bind-Value="_model.Expression"
For="@(() => _model.Expression)"
Disabled="@(_model.FillerKind is not FillerKind.MidRoll)"
HelperText="For mid-roll filler, only add filler when this expression evaluates to true for a given mid-roll point."/>
</MudStack>
<MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="gap-md-8 mb-5">
<div class="d-flex" style="width: 300px"></div>
<MudText Typo="Typo.body2">
<span style="font-weight: bold;">total_points</span>: total number of potential mid-roll points
<br />
<span style="font-weight: bold;">total_duration</span>: total duration of the content, in seconds
<br />
<span style="font-weight: bold;">total_progress</span>: normalized position from 0 to 1
<br />
<span style="font-weight: bold;">last_mid_filler</span>: seconds since last mid-roll filler
<br />
<span style="font-weight: bold;">remaining_duration</span>: duration of the content after this mid-roll point, in seconds
<br />
<span style="font-weight: bold;">point</span>: the position of the mid-roll point, in seconds
<br />
<span style="font-weight: bold;">num</span>: the mid-roll point number, starting with 1
</MudText>
</MudStack>
</MudContainer>
</div>
</MudForm>
@@ -246,6 +273,7 @@
_model.MediaItem = fillerPreset.MediaItemId.HasValue
? _televisionShows.Append(_televisionSeasons).Append(_artists).ToList().Find(vm => vm.MediaItemId == fillerPreset.MediaItemId.Value)
: null;
_model.Expression = fillerPreset.Expression;
});
}
else
ErsatzTV/ViewModels/FillerPresetEditViewModel.cs
+11 -2
View File
@@ -30,6 +30,11 @@ public class FillerPresetEditViewModel
{
FillerMode = FillerMode.None;
}
if (_fillerKind is not FillerKind.MidRoll)
{
Expression = string.Empty;
}
}
}
@@ -81,6 +86,8 @@ public class FillerPresetEditViewModel
public MultiCollectionViewModel MultiCollection { get; set; }
public SmartCollectionViewModel SmartCollection { get; set; }
public string Expression { get; set; }
public IRequest<Either<BaseError, Unit>> ToEdit() =>
new UpdateFillerPreset(
Id,
@@ -95,7 +102,8 @@ public class FillerPresetEditViewModel
Collection?.Id,
MediaItem?.MediaItemId,
MultiCollection?.Id,
SmartCollection?.Id);
SmartCollection?.Id,
Expression);
public IRequest<Either<BaseError, Unit>> ToUpdate() =>
new CreateFillerPreset(
@@ -110,7 +118,8 @@ public class FillerPresetEditViewModel
Collection?.Id,
MediaItem?.MediaItemId,
MultiCollection?.Id,
SmartCollection?.Id);
SmartCollection?.Id,
Expression);
private static TimeSpan FixDuration(TimeSpan duration) =>
duration > TimeSpan.FromDays(1) ? duration.Subtract(TimeSpan.FromDays(1)) : duration;