chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JSON: Disable comments by default; re-factor handling of string literals

Browse Source
This commit is contained in:
Katy Coe
2020-08-03 22:11:40 +02:00
parent 753b37ad67
commit 5bb879a676
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Il2CppInspector.Common/Outputs/JSONMetadata.cs
View File

@@ -11,13 +11,18 @@ using Il2CppInspector.Model;
namespace Il2CppInspector.Outputs namespace Il2CppInspector.Outputs
{ {
// Output module to produce machine readable metadata in JSON format
public class JSONMetadata public class JSONMetadata
{ {
private readonly AppModel model; private readonly AppModel model;
private Utf8JsonWriter writer; private Utf8JsonWriter writer;
// Allow non-compliant C-style comments in JSON output
public bool AllowComments { get; set; } = false;
public JSONMetadata(AppModel model) => this.model = model; public JSONMetadata(AppModel model) => this.model = model;
// Write JSON metadata to file
public void Write(string outputFile) { public void Write(string outputFile) {
using var fs = new FileStream(outputFile, FileMode.Create); using var fs = new FileStream(outputFile, FileMode.Create);
@@ -68,12 +73,20 @@ namespace Il2CppInspector.Outputs
} }
private void writeStringLiterals() { private void writeStringLiterals() {
writeObject("stringLiterals", () => { writeArray("stringLiterals", () => {
foreach (var str in model.Strings) foreach (var str in model.Strings)
if (model.StringIndexesAreOrdinals) writeObject(() => {
writer.WriteNumber(str.Value, str.Key); // For version < 19
else if (model.StringIndexesAreOrdinals) {
writer.WriteString(str.Key.ToAddressString(), str.Value); writer.WriteNumber("ordinal", str.Key);
writer.WriteString("name", $"STRINGLITERAL_{str.Key}_{stringToIdentifier(str.Value)}");
// For version >= 19
} else {
writer.WriteString("virtualAddress", str.Key.ToAddressString());
writer.WriteString("name", "StringLiteral_" + stringToIdentifier(str.Value));
}
writer.WriteString("string", str.Value);
});
}, "String literals"); }, "String literals");
} }
@@ -154,7 +167,7 @@ namespace Il2CppInspector.Outputs
private void writeObject(Action objectWriter) => writeObject(null, objectWriter); private void writeObject(Action objectWriter) => writeObject(null, objectWriter);
private void writeObject(string name, Action objectWriter, string description = null) { private void writeObject(string name, Action objectWriter, string description = null) {
if (description != null) if (AllowComments && description != null)
writer.WriteCommentValue(" " + description + " "); writer.WriteCommentValue(" " + description + " ");
if (name != null) if (name != null)
writer.WriteStartObject(name); writer.WriteStartObject(name);
@@ -166,7 +179,7 @@ namespace Il2CppInspector.Outputs
private void writeArray(string name, Action arrayWriter, string description = null) { private void writeArray(string name, Action arrayWriter, string description = null) {
writer.WriteStartArray(name); writer.WriteStartArray(name);
if (description != null) if (AllowComments && description != null)
writer.WriteCommentValue(" " + description + " "); writer.WriteCommentValue(" " + description + " ");
arrayWriter(); arrayWriter();
writer.WriteEndArray(); writer.WriteEndArray();
@@ -194,5 +207,10 @@ namespace Il2CppInspector.Outputs
private void writeDotNetTypeName(TypeInfo type) { private void writeDotNetTypeName(TypeInfo type) {
writer.WriteString("dotNetType", type.CSharpName); writer.WriteString("dotNetType", type.CSharpName);
} }
private static string stringToIdentifier(string str) {
str = str.Substring(0, Math.Min(32, str.Length));
return str.ToCIdentifier();
}
} }
} }