Add quotes to strings in array to avoid csv serialization problem

aianlinb · Dec 11, 2022 · 0d9b296 · 0d9b296
1 parent b010ce3
commit 0d9b296
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/LibDat2/LibDat2.csproj b/LibDat2/LibDat2.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <Authors>aianlinb</Authors>
     <Copyright>Copyright © 2020-2022 aianlinb</Copyright>
-    <Version>0.15.2</Version>
+    <Version>0.15.3</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>embedded</DebugType>
   </PropertyGroup>

diff --git a/LibDat2/Types/ArrayData.cs b/LibDat2/Types/ArrayData.cs
@@ -247,7 +247,7 @@ public override ArrayData<TypeOfValueInArray> FromString(string value) {
 				newValue = new TypeOfValueInArray[sarray.Length];
 				if (TypeOfValue.EndsWith("string"))
 					for (var n = 0; n < sarray.Length; ++n)
-						newValue[n] = (TypeOfValueInArray)IFieldData.FromString(sarray[n], TypeOfValue, Dat);
+						newValue[n] = (TypeOfValueInArray)IFieldData.FromString(sarray[n].Trim('"', ' '), TypeOfValue, Dat);
 				else
 					for (var n = 0; n < sarray.Length; ++n)
 						newValue[n] = (TypeOfValueInArray)IFieldData.FromString(sarray[n], TypeOfValue, Dat).Value;
@@ -272,18 +272,26 @@ public override string ToString() {
 			if (Value == null)
 				return "{null}";
 			var s = new StringBuilder("[");
-			foreach (var f in Value) {
-				s.Append(f?.ToString() ?? "{null}");
-				if (Value is uint or ulong)
-					s.Append('U');
-				if (Value is long or ulong)
-					s.Append('L');
-				else if (Value is float)
-					s.Append('F');
-				else if (Value is double)
-					s.Append('D');
-				s.Append(", ");
-			}
+
+			if (TypeOfValue.EndsWith("string"))
+				foreach (var f in Value) {
+					s.Append(f == null ? "{null}" : $"\"{f}\"");
+					s.Append(", ");
+				}
+			else
+				foreach (var f in Value) {
+					s.Append(f?.ToString() ?? "{null}");
+					if (Value is uint or ulong)
+						s.Append('U');
+					if (Value is long or ulong)
+						s.Append('L');
+					else if (Value is float)
+						s.Append('F');
+					else if (Value is double)
+						s.Append('D');
+					s.Append(", ");
+				}
+
 			if (s.Length > 2)
 				s.Remove(s.Length - 2, 2);
 			s.Append(']');

diff --git a/LibDat2/Types/IFieldData.cs b/LibDat2/Types/IFieldData.cs
@@ -39,7 +39,7 @@ public static int SizeOfType(string type, bool x64) {
 				"i64"			=> 8,
 				"u64"			=> 8,
 				"f64"			=> 8,
-				"valuestring"	=> -1,
+				"valuestring"	=> -1, // Shouldn't be used
 				_ => throw new ArgumentException("Unknown Type: " + type, nameof(type))
 			};
 		}

diff --git a/VisualGGPK2/VisualGGPK2.csproj b/VisualGGPK2/VisualGGPK2.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Authors>aianlinb</Authors>
     <Copyright>Copyright © 2020-2022 aianlinb</Copyright>
-    <Version>0.15.2</Version>
+    <Version>0.15.3</Version>
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>