Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/NwcIO/Internal/Container/NwcStreamSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,18 @@ public static byte[] BuildSelectionSetsStream(IReadOnlyList<Model.Sets.NwcSetIte

public static byte[] BuildTimeLinerStream(Model.TimeLiner.NwcTimeLinerSchedule schedule)
{
using var csvMs = new MemoryStream();
Model.TimeLiner.NwcTimeLinerCsvSerializer.Write(schedule, csvMs);
byte[] csvBytes = csvMs.ToArray();
using var xmlMs = new MemoryStream();
Model.TimeLiner.NwcTimeLinerXmlSerializer.Write(schedule, xmlMs);
var xmlBytes = xmlMs.ToArray();

using var ms = new MemoryStream();
using var w = new BinaryWriter(ms);

w.Write(100); // tag category
w.Write(106); // tag TimeLiner
w.Write(schedule.Tasks.Count);
w.Write(csvBytes.Length);
w.Write(csvBytes);
w.Write(xmlBytes.Length);
w.Write(xmlBytes);

return ms.ToArray();
}
Expand Down
34 changes: 27 additions & 7 deletions src/NwcIO/Internal/Parsing/TimeLinerParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,48 @@ internal static class TimeLinerParser
var data = stream.Data;
if (data.Length < 8) return null;

// Binary header [100][106][count][length][csv bytes]
// Binary header [100][106][count][length][XML or legacy CSV bytes]
if (BinaryPrimitives.ReadInt32LittleEndian(data.AsSpan(0)) == 100 &&
BinaryPrimitives.ReadInt32LittleEndian(data.AsSpan(4)) == 106 &&
data.Length >= 16)
{
int csvLen = BinaryPrimitives.ReadInt32LittleEndian(data.AsSpan(12));
if (csvLen > 0 && 16 + csvLen <= data.Length)
var payloadLength = BinaryPrimitives.ReadInt32LittleEndian(data.AsSpan(12));
if (payloadLength > 0 && payloadLength <= data.Length - 16)
{
using var ms = new MemoryStream(data, 16, csvLen, writable: false);
return NwcTimeLinerCsvSerializer.Read(ms);
using var ms = new MemoryStream(data, 16, payloadLength, writable: false);
return ReadPayload(ms);
}
}

// Direct CSV payload
// Direct XML or legacy CSV payload
try
{
using var ms = new MemoryStream(data, writable: false);
return NwcTimeLinerCsvSerializer.Read(ms);
return ReadPayload(ms);
}
catch
{
return null;
}
}

private static NwcTimeLinerSchedule ReadPayload(Stream stream)
{
var position = stream.Position;
int firstCharacter;
using (var reader = new StreamReader(stream, Encoding.UTF8, leaveOpen: true))
{
// StreamReader handles the BOM; skip whitespace before the XML marker.
do
{
firstCharacter = reader.Read();
}
while (firstCharacter >= 0 && char.IsWhiteSpace((char)firstCharacter));
}

stream.Position = position;
return firstCharacter == '<'
? NwcTimeLinerXmlSerializer.Read(stream)
: NwcTimeLinerCsvSerializer.Read(stream);
}
}
82 changes: 82 additions & 0 deletions tests/NwcIO.Tests/TimeLinerTests.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,92 @@
using System.Text;
using NwcIO.Internal.Container;
using NwcIO.Model.TimeLiner;
using Xunit;

namespace NwcIO.Tests;

public class TimeLinerTests
{
[Fact]
public void TimeLinerSchedule_NwcRoundtrip_PreservesTaskTreeAndMetadata()
{
var start = new DateTimeOffset(2026, 9, 1, 0, 0, 0, TimeSpan.Zero);
var parent = new NwcTimeLinerTask("P", "Phase 1", start, start.AddDays(30))
{
Progress = 0.5,
};
parent.AttachedNodeIds.AddRange([7, 8]);
var child = new NwcTimeLinerTask("C", "Child", start, start.AddDays(10))
{
Progress = 1.0,
};
child.AttachedNodeIds.Add(9);
parent.Children.Add(child);
var multiline = new NwcTimeLinerTask("M", "Line1\nLine2\r\nLine3", start, start.AddDays(5));
var schedule = new NwcTimeLinerSchedule("My Schedule", [parent, multiline]);
var doc = new NwcDocumentBuilder()
.SetFileInfo("ScheduleModel.nwc")
.SetTimeLiner(schedule)
.Build();

using var ms = new MemoryStream();
doc.Save(ms);
ms.Position = 0;

var loaded = NwcDocument.Open(ms).TimeLiner;
Assert.NotNull(loaded);
Assert.Equal(schedule.Name, loaded.Name);
Assert.Equal(2, loaded.Tasks.Count);
Assert.Equal(3, loaded.FlattenTasks().Count());
var loadedParent = loaded.Tasks[0];
Assert.Equal(parent.Id, loadedParent.Id);
Assert.Equal(parent.Name, loadedParent.Name);
Assert.Equal(parent.Progress, loadedParent.Progress);
Assert.Equal(parent.AttachedNodeIds, loadedParent.AttachedNodeIds);
var loadedChild = Assert.Single(loadedParent.Children);
Assert.Equal(child.Id, loadedChild.Id);
Assert.Equal(child.Name, loadedChild.Name);
Assert.Equal(child.Progress, loadedChild.Progress);
Assert.Equal(child.AttachedNodeIds, loadedChild.AttachedNodeIds);
Assert.Empty(loadedChild.Children);
Assert.Equal(multiline.Id, loaded.Tasks[1].Id);
Assert.Equal(multiline.Name, loaded.Tasks[1].Name);
}

[Fact]
public void TimeLinerSchedule_OpensLegacyEmbeddedCsv()
{
// Construct the old binary payload independently of the current writer.
var csv = "\uFEFFTask ID,Task Name,Task Type,Planned Start,Planned End,Actual Start,Actual End,Planned Cost,ActualCost,Attached Set,Progress\r\n"
+ "A1,Groundworks,Construct,2026-09-01 00:00:00,2026-09-15 00:00:00,,,75000.00,,Groundwork Elements,50 %\r\n";
var csvBytes = Encoding.UTF8.GetBytes(csv);
using var payload = new MemoryStream();
using (var writer = new BinaryWriter(payload, Encoding.UTF8, leaveOpen: true))
{
writer.Write(100);
writer.Write(106);
writer.Write(1);
writer.Write(csvBytes.Length);
writer.Write(csvBytes);
}

using var ms = new MemoryStream();
NwcContainerWriter.Write(ms, [payload.ToArray()]);
ms.Position = 0;

var loaded = NwcDocument.Open(ms).TimeLiner;
Assert.NotNull(loaded);
Assert.Equal("TimeLiner Schedule", loaded.Name);
var task = Assert.Single(loaded.Tasks);
Assert.Equal("A1", task.Id);
Assert.Equal("Groundworks", task.Name);
Assert.Equal(NwcTimeLinerTaskType.Construct, task.TaskType);
Assert.Equal(new DateTimeOffset(2026, 9, 1, 0, 0, 0, TimeSpan.Zero), task.PlannedStart);
Assert.Equal(task.PlannedStart.AddDays(14), task.PlannedEnd);
Assert.Equal(75000m, task.PlannedCost);
Assert.Equal("Groundwork Elements", task.AttachedSelectionSetName);
}

[Fact]
public void TimeLinerSchedule_ComputesDatesAndProgress()
{
Expand Down
Loading