Optimize Packet.AddValue packet field path formatting

Author: Shauren

WowPacketParser/Misc/Extensions.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics.Contracts;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using WowPacketParser.Enums;
 using WowPacketParser.Proto;
@@ -176,6 +177,29 @@ public static IEnumerable<T> Flatten<T>(this IEnumerable<T> values)
             }
         }
 
+        public static StringBuilder AppendObjectPropertyPath(this StringBuilder builder, object[] keys)
+        {
+            foreach (var value in keys)
+            {
+                if (value == null)
+                    continue;
+
+                switch (value)
+                {
+                    case string str:
+                        builder.Append('(').Append(str).Append(") ");
+                        break;
+                    case object[] nested:
+                        builder.AppendObjectPropertyPath(nested);
+                        break;
+                    default:
+                        builder.Append('[').Append(value).Append("] ");
+                        break;
+                }
+            }
+            return builder;
+        }
+
         public static string GetExtension(this FileCompression value)
         {
             var attributes = (FileCompressionAttribute[])value.GetType().GetField(value.ToString()).GetCustomAttributes(typeof(FileCompressionAttribute), false);

WowPacketParser/Misc/Packet.cs

@@ -3,11 +3,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net;
-using System.Runtime.InteropServices;
 using System.Text;
 using WowPacketParser.Enums;
 using WowPacketParser.Enums.Version;
-using WowPacketParser.Parsing.Parsers;
 using WowPacketParser.Proto;
 using WowPacketParser.Store;
 using WowPacketParser.Store.Objects;
@@ -248,7 +246,7 @@ public T AddValue<T>(string name, T obj, params object[] indexes)
                 return obj;
 
             Writer ??= new StringBuilder();
-            Writer.AppendLine($"{GetIndexString(indexes)}{name}: {obj}");
+            Writer.AppendObjectPropertyPath(indexes).Append(name).Append(": ").Append(obj).AppendLine();
 
             return obj;
         }
@@ -259,7 +257,7 @@ public void AddLine(string value, params object[] indexes)
                 return;
 
             Writer ??= new StringBuilder();
-            Writer.AppendLine($"{GetIndexString(indexes)}{value}");
+            Writer.AppendObjectPropertyPath(indexes).Append(value).AppendLine();
         }
     }
 }

WowPacketParser/Misc/PacketReads.cs

@@ -455,9 +455,8 @@ public byte[] ReadBytesString(string name, int length, params object[] indexes)
         public byte[] ReadBytesTable(string name, int length, params object[] indexes)
         {
             var val = ReadBytes(length);
-            AddValue(name, Utilities.ByteArrayToHexTable(val, true,
-                GetIndexString(indexes).Length + name.Length + ": ".Length),
-                indexes);
+            AddLine(name, indexes);
+            Write(Utilities.ByteArrayToHexTable(val, true));
             return val;
         }
 
@@ -760,17 +759,5 @@ private static string FormatInteger(IFormattable value, string name)
                 return $"{value} (0x{value:X4}) ({name})";
             return value + " (" + name + ")";
         }
-
-        private static string GetIndexString(params object[] values)
-        {
-            var list = values.Flatten();
-
-            return list.Where(value => value != null)
-                .Aggregate(string.Empty, (current, value) =>
-                {
-                    var s = value is string ? "()" : "[]";
-                    return current + (s[0] + value.ToString() + s[1] + ' ');
-                });
-        }
     }
 }