Serialize all unparsed HIRC items as byte[]

Author: henbagle

ME3Tweaks.Wwiser.Tests/HierarchyTests/UnknownItemTests.cs

@@ -0,0 +1,18 @@
+using ME3Tweaks.Wwiser.Model.Hierarchy;
+
+namespace ME3Tweaks.Wwiser.Tests.HierarchyTests;
+
+public class UnknownItemTests
+{
+    [Test]
+    public void UnparsedHIRCItem_Reserializes()
+    {
+        var data = TestData.GetTestDataBytes(@"Hierarchy", @"Bus", "Bus_v56.bin");
+        var (_, result) = TestHelpers.Deserialize<HircItemContainer>(data, 56);
+        
+        Assert.That(result.Item, Is.TypeOf<EmptyHircItem>());
+
+        var reserialized = TestHelpers.Serialize(result, 56);
+        Assert.That(reserialized, Is.EquivalentTo(data));
+    }
+}

ME3Tweaks.Wwiser.Tests/TestData/Hierarchy/Bus/Bus_v56.bin

@@ -6,9 +6,7 @@ namespace ME3Tweaks.Wwiser.Model.Hierarchy;
 public class EmptyHircItem : HircItem
 {
     [FieldOrder(0)]
-    [FieldLength(nameof(HircItemContainer.Size), AncestorType = typeof(HircItemContainer),
-        RelativeSourceMode = RelativeSourceMode.FindAncestor)]
-    public byte[] Data { get; set; } = Array.Empty<byte>();
+    public byte[] Data { get; set; } = [];
 
-    [Ignore] public override HircType HircType => HircType.Action;
+    [Ignore] public override HircType HircType => HircType.None;
 }

ME3Tweaks.Wwiser/Model/Hierarchy/EmptyHircItem.cs

@@ -14,5 +14,6 @@ public class HircItemContainer
     [FieldOrder(3)]
     [FieldLength(nameof(Size))]
     [SubtypeFactory($"{nameof(Type)}.{nameof(Type.Value)}", typeof(HircItemSubtypeFactory))]
+    [SubtypeDefault(typeof(EmptyHircItem))]
     public required HircItem Item { get; set; }
 }

ME3Tweaks.Wwiser/Model/Hierarchy/HircItemContainer.cs

@@ -21,20 +21,19 @@ public class HircItemSubtypeFactory : ISubtypeFactory
         { typeof(FxCustom), HircType.FxCustom },
     };
 
-    public bool TryGetKey(Type valueType, [UnscopedRef] out object key)
+    public bool TryGetKey(Type valueType, out object? key)
     {
         if (TypeToEnum.TryGetValue(valueType, out var value))
         {
             key = value;
             return true;
         }
 
-        // fallback
-        throw new ArgumentException($"Cannot parse Hirc type ${valueType}");
-        //return false;
+        key = null;
+        return false;
     }
 
-    public bool TryGetType(object key, [UnscopedRef] out Type type)
+    public bool TryGetType(object key, [UnscopedRef] out Type? type)
     {
         if (key is byte b)
         {
@@ -67,8 +66,8 @@ public bool TryGetType(object key, [UnscopedRef] out Type type)
             //HircType.Envelope =>
             //HircType.AudioDevice =>
             //HircType.TimeMod =>
-            _ => throw new ArgumentException($"Cannot parse Hirc type ${(HircType)key} yet")
+            _ => null
         };
-        return true;
+        return type != null;
     }
 }