Browse Source

fix block filler progression (#2278)

pull/2279/head
Jason Dove 1 year ago committed by GitHub
parent
commit
bd09f3dfdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      ErsatzTV.Core/Scheduling/BlockScheduling/BlockPlayoutFillerBuilder.cs

8
ErsatzTV.Core/Scheduling/BlockScheduling/BlockPlayoutFillerBuilder.cs

@ -27,11 +27,13 @@ public class BlockPlayoutFillerBuilder( @@ -27,11 +27,13 @@ public class BlockPlayoutFillerBuilder(
PlayoutBuildMode mode,
CancellationToken cancellationToken)
{
var allItems = referenceData.ExistingItems.Append(result.AddedItems).ToList();
if (mode is PlayoutBuildMode.Reset)
{
// remove all playout items with type filler
// except block items that are hidden from the guide (guide mode)
var toRemove = result.AddedItems
var toRemove = allItems
.Where(pi => pi.FillerKind is not FillerKind.None and not FillerKind.GuideMode)
.ToList();
foreach (PlayoutItem playoutItem in toRemove)
@ -43,7 +45,7 @@ public class BlockPlayoutFillerBuilder( @@ -43,7 +45,7 @@ public class BlockPlayoutFillerBuilder(
var collectionEnumerators = new Dictionary<CollectionKey, IMediaCollectionEnumerator>();
// find all unscheduled periods
var queue = new Queue<PlayoutItem>(result.AddedItems);
var queue = new Queue<PlayoutItem>(allItems);
while (queue.Count > 1)
{
PlayoutItem one = queue.Dequeue();
@ -81,7 +83,7 @@ public class BlockPlayoutFillerBuilder( @@ -81,7 +83,7 @@ public class BlockPlayoutFillerBuilder(
collectionItems,
start,
playout.Seed,
result.AddedHistory,
referenceData.PlayoutHistory.Append(result.AddedHistory).ToList(),
deco,
historyKey);

Loading…
Cancel
Save