don't flatten table

RobinKa · Nov 18, 2021 · df8ef5b · df8ef5b
1 parent 712666c
commit df8ef5b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 26 deletions.
diff --git a/Media/RGDViewer.png b/Media/RGDViewer.png
diff --git a/RGDReader/ChunkyFileReader.cs b/RGDReader/ChunkyFileReader.cs
@@ -103,24 +103,9 @@ public KeyValueDataChunk ReadKeyValueDataChunk(int length)
 
         var table = ReadTable();
 
-        Dictionary<ulong, (int Type, object Value)> flatTable = new();
-
-        void addToFlatTable(Dictionary<ulong, (int Type, object Value)> t)
-        {
-            foreach (var (key, tv) in t)
-            {
-                flatTable[key] = tv;
-                if (tv.Type == 100 || tv.Type == 101)
-                {
-                    addToFlatTable((Dictionary<ulong, (int Type, object Value)>)tv.Value);
-                }
-            }
-        }
-        addToFlatTable(table);
-
         BaseStream.Position = startPosition + length;
 
-        return new KeyValueDataChunk(flatTable);
+        return new KeyValueDataChunk(table);
     }
 
     public KeysDataChunk ReadKeysDataChunk()

diff --git a/RGDReaderCLI/Program.cs b/RGDReaderCLI/Program.cs
@@ -51,18 +51,29 @@
     var keysInv = ChunkyUtil.ReverseReadOnlyDictionary(keys.StringKeys);
     var resolved = ChunkyUtil.ResolveKeyValues(keys, kvs);
     Console.WriteLine("All key-values");
-    foreach (var kv in resolved)
+
+    void printTable(IReadOnlyDictionary<ulong, (int Type, object Value)> table, int indent = 0)
     {
-        if (kv.Value.HasValue)
+        foreach (var (childKey, (childType, childValue)) in table)
         {
-            Console.WriteLine(
-                "{0}: [{1}] <{2}>",
-                kv.Key,
-                typeDisplayName[kv.Value.Value.Type],
-                kv.Value.Value.Value is IReadOnlyDictionary<ulong, (int Type, object Value)> dict ?
-                    string.Join(", ", dict.Keys.Select(key => keysInv.GetValueOrDefault(key, "<Unknown>"))) :
-                    kv.Value.Value.Value
-            );
+            printValue(childKey, childType, childValue, indent + 1);
         }
     }
+
+    void printValue(ulong key, int type, object value, int indent = 0)
+    {
+        Console.Write(string.Join("", Enumerable.Range(0, indent).Select(_ => "  ")));
+        Console.Write(keysInv.GetValueOrDefault(key, "<Unknown>"));
+        if (value is IReadOnlyDictionary<ulong, (int Type, object Value)> table)
+        {
+            Console.WriteLine(" [Table]");
+            printTable(table, indent + 1);
+        }
+        else
+        {
+            Console.WriteLine(" [{0}] <{1}>", typeDisplayName[type], value);
+        }
+    }
+
+    printTable(kvs.KeyValues);
 }