fix repeating content (#838)

* fix repeating content

* update dependencies

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Fixed
+- Fix content repeating for up to a minute near the top of every hour
 
 ## [0.6.1-beta] - 2022-06-03
 ### Fixed

ErsatzTV.Application/Playouts/Commands/BuildPlayoutHandler.cs

@@ -5,6 +5,7 @@ using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Scheduling;
+using ErsatzTV.Core.Scheduling;
 using ErsatzTV.Infrastructure.Data;
 using ErsatzTV.Infrastructure.Extensions;
 using Microsoft.EntityFrameworkCore;
@@ -37,7 +38,7 @@ public class BuildPlayoutHandler : IRequestHandler<BuildPlayout, Either<BaseErro
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
         Validation<BaseError, Playout> validation = await Validate(dbContext, request);
-        return await LanguageExtensions.Apply(validation, playout => ApplyUpdateRequest(dbContext, request, playout));
+        return await validation.Apply(playout => ApplyUpdateRequest(dbContext, request, playout));
     }
 
     private async Task<Unit> ApplyUpdateRequest(TvContext dbContext, BuildPlayout request, Playout playout)
@@ -45,7 +46,11 @@ public class BuildPlayoutHandler : IRequestHandler<BuildPlayout, Either<BaseErro
         try
         {
             await _playoutBuilder.Build(playout, request.Mode);
-            if (await dbContext.SaveChangesAsync() > 0)
+
+            // let any active segmenter processes know that the playout has been modified
+            // and therefore the segmenter may need to seek into the next item instead of
+            // starting at the beginning (if already working ahead)
+            if (request.Mode != PlayoutBuildMode.Continue && await dbContext.SaveChangesAsync() > 0)
             {
                 _ffmpegSegmenterService.PlayoutUpdated(playout.Channel.Number);
             }

ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@@ -10,7 +10,7 @@
       <PackageReference Include="Bugsnag" Version="3.0.1" />
       <PackageReference Include="CliWrap" Version="3.4.4" />
       <PackageReference Include="FluentAssertions" Version="6.7.0" />
-      <PackageReference Include="LanguageExt.Core" Version="4.1.1" />
+      <PackageReference Include="LanguageExt.Core" Version="4.2.2" />
       <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />

ErsatzTV.Core/ErsatzTV.Core.csproj

@@ -10,7 +10,8 @@
       <PackageReference Include="Bugsnag" Version="3.0.1" />
       <PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
       <PackageReference Include="Flurl" Version="3.0.6" />
-      <PackageReference Include="LanguageExt.Core" Version="4.1.1" />
+      <PackageReference Include="LanguageExt.Core" Version="4.2.2" />
+      <PackageReference Include="LanguageExt.Transformers" Version="4.2.2" />
       <PackageReference Include="MediatR" Version="10.0.1" />
       <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />

ErsatzTV.Core/Scheduling/PlayoutBuildMode.cs

@@ -2,12 +2,18 @@
 
 public enum PlayoutBuildMode
 {
-    // this continues building playout into the future
+    /// <summary>
+    ///     Continue building the playout into the future, without changing any existing playout items
+    /// </summary>
     Continue = 1,
 
-    // this rebuilds a playout but will maintain collection progress
+    /// <summary>
+    ///     Rebuild the playout while attempting to maintain collection progress
+    /// </summary>
     Refresh = 2,
 
-    // this rebuilds a playout and clears all state
+    /// <summary>
+    ///     Rebuild the playout from scratch (clearing all state)
+    /// </summary>
     Reset = 3
 }

ErsatzTV.FFmpeg/ErsatzTV.FFmpeg.csproj

@@ -8,7 +8,7 @@
 
     <ItemGroup>
       <PackageReference Include="CliWrap" Version="3.4.4" />
-      <PackageReference Include="LanguageExt.Core" Version="4.1.1" />
+      <PackageReference Include="LanguageExt.Core" Version="4.2.2" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
     </ItemGroup>
 

ErsatzTV/ErsatzTV.csproj

@@ -57,8 +57,8 @@
       <PackageReference Include="Bugsnag.AspNet.Core" Version="3.0.1" />
       <PackageReference Include="FluentValidation" Version="11.0.2" />
       <PackageReference Include="FluentValidation.AspNetCore" Version="11.0.2" />
-      <PackageReference Include="HtmlSanitizer" Version="7.1.509" />
+      <PackageReference Include="HtmlSanitizer" Version="7.1.512" />
-      <PackageReference Include="LanguageExt.Core" Version="4.1.1" />
+      <PackageReference Include="LanguageExt.Core" Version="4.2.2" />
       <PackageReference Include="Markdig" Version="0.30.2" />
       <PackageReference Include="MediatR.Courier.DependencyInjection" Version="5.0.0" />
       <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />