Browse Source

pass tz again

pull/2600/head
Jason Dove 9 months ago
parent
commit
e506bb913d
No known key found for this signature in database
  1. 7
      ErsatzTV.Core/Scheduling/BlockScheduling/EffectiveBlock.cs

7
ErsatzTV.Core/Scheduling/BlockScheduling/EffectiveBlock.cs

@ -27,7 +27,7 @@ internal record EffectiveBlock(Block Block, BlockKey BlockKey, DateTimeOffset St
DateTimeOffset today = current; DateTimeOffset today = current;
var newBlocks = playoutTemplate.Template.Items var newBlocks = playoutTemplate.Template.Items
.Map(i => ToEffectiveBlock(playoutTemplate, i, today)) .Map(i => ToEffectiveBlock(playoutTemplate, i, today, timeZone))
.Map(NormalizeGuideMode) .Map(NormalizeGuideMode)
.ToList(); .ToList();
@ -47,7 +47,8 @@ internal record EffectiveBlock(Block Block, BlockKey BlockKey, DateTimeOffset St
private static EffectiveBlock ToEffectiveBlock( private static EffectiveBlock ToEffectiveBlock(
PlayoutTemplate playoutTemplate, PlayoutTemplate playoutTemplate,
TemplateItem templateItem, TemplateItem templateItem,
DateTimeOffset current) DateTimeOffset current,
TimeZoneInfo timeZone)
{ {
var blockStartTime = new DateTime( var blockStartTime = new DateTime(
current.Year, current.Year,
@ -58,8 +59,6 @@ internal record EffectiveBlock(Block Block, BlockKey BlockKey, DateTimeOffset St
0, 0,
DateTimeKind.Unspecified); DateTimeKind.Unspecified);
// use the system's local time zone
var timeZone = TimeZoneInfo.Local;
var blockStart = new DateTimeOffset(blockStartTime, timeZone.GetUtcOffset(blockStartTime)); var blockStart = new DateTimeOffset(blockStartTime, timeZone.GetUtcOffset(blockStartTime));
return new EffectiveBlock( return new EffectiveBlock(

Loading…
Cancel
Save