Add compact argument for toJSON from ID #0008848

Audifire · Audifire · commit c30efc1190bf · 2015-05-10T23:28:29.000+02:00
diff --git a/MTA10/mods/shared_logic/lua/CLuaArguments.cpp b/MTA10/mods/shared_logic/lua/CLuaArguments.cpp
@@ -529,12 +529,12 @@ bool CLuaArguments::WriteToBitStream ( NetBitStreamInterface& bitStream, CFastHa
 }
 
 
-bool CLuaArguments::WriteToJSONString ( std::string& strJSON, bool bSerialize )
+bool CLuaArguments::WriteToJSONString ( std::string& strJSON, bool bSerialize, bool bCompact )
 {
     json_object * my_array = WriteToJSONArray ( bSerialize );
     if ( my_array )
     {
-        strJSON = json_object_get_string ( my_array );
+        strJSON = json_object_to_json_string_ext ( my_array, bCompact ? JSON_C_TO_STRING_PLAIN : JSON_C_TO_STRING_SPACED );
         json_object_put ( my_array ); // dereference - causes a crash, is actually commented out in the example too
         return true;
     }
diff --git a/MTA10/mods/shared_logic/lua/CLuaArguments.h b/MTA10/mods/shared_logic/lua/CLuaArguments.h
@@ -75,7 +75,7 @@ class CLuaArguments
     bool                                                WriteToBitStream    ( NetBitStreamInterface& bitStream, CFastHashMap < CLuaArguments*, unsigned long > * pKnownTables = NULL ) const;
     void                                                ValidateTableKeys   ( void );
     bool                                                ReadFromJSONString  ( const char* szJSON );
-    bool                                                WriteToJSONString   ( std::string& strJSON, bool bSerialize = false );
+    bool                                                WriteToJSONString   ( std::string& strJSON, bool bSerialize = false, bool bCompact = false );
     json_object *                                       WriteTableToJSONObject ( bool bSerialize = false, CFastHashMap < CLuaArguments*, unsigned long > * pKnownTables = NULL );
     json_object *                                       WriteToJSONArray    ( bool bSerialize );
     bool                                                ReadFromJSONObject  ( json_object * object, std::vector < CLuaArguments* > * pKnownTables = NULL );
diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Commands.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Commands.cpp
@@ -121,13 +121,16 @@ int CLuaFunctionDefs::toJSON ( lua_State* luaVM )
 
     if ( !argStream.NextIsNil ( ) )
     {
+        bool bCompact = false;
         // Read the argument
         CLuaArguments JSON;
         JSON.ReadArgument ( luaVM, 1 );
+        argStream.Skip ( 1 );
+        argStream.ReadBool ( bCompact, false );
 
         // Convert it to a JSON string
         std::string strJSON;
-        if ( JSON.WriteToJSONString ( strJSON ) )
+        if ( JSON.WriteToJSONString ( strJSON, false, bCompact ) )
         {
             // Return the JSON string
             lua_pushstring ( luaVM, strJSON.c_str () );
diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaArguments.cpp b/MTA10_Server/mods/deathmatch/logic/lua/CLuaArguments.cpp
@@ -589,12 +589,12 @@ bool CLuaArguments::WriteToBitStream ( NetBitStreamInterface& bitStream, CFastHa
 }
 
 
-bool CLuaArguments::WriteToJSONString ( std::string& strJSON, bool bSerialize )
+bool CLuaArguments::WriteToJSONString ( std::string& strJSON, bool bSerialize, bool bCompact )
 {
     json_object * my_array = WriteToJSONArray ( bSerialize );
     if ( my_array )
     {
-        strJSON = json_object_get_string ( my_array );
+        strJSON = json_object_to_json_string_ext ( my_array, bCompact ? JSON_C_TO_STRING_PLAIN : JSON_C_TO_STRING_SPACED );
         json_object_put ( my_array ); // dereference - causes a crash, is actually commented out in the example too
         return true;
     }
diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaArguments.h b/MTA10_Server/mods/deathmatch/logic/lua/CLuaArguments.h
@@ -93,7 +93,7 @@ class CLuaArguments
     bool                                                ReadFromBitStream   ( NetBitStreamInterface& bitStream, std::vector < CLuaArguments* > * pKnownTables = NULL );
     bool                                                ReadFromJSONString  ( const char* szJSON );
     bool                                                WriteToBitStream    ( NetBitStreamInterface& bitStream, CFastHashMap < CLuaArguments*, unsigned long > * pKnownTables = NULL ) const;
-    bool                                                WriteToJSONString   ( std::string& strJSON, bool bSerialize = false );
+    bool                                                WriteToJSONString   ( std::string& strJSON, bool bSerialize = false, bool bCompact = false );
     json_object *                                       WriteTableToJSONObject ( bool bSerialize = false, CFastHashMap < CLuaArguments*, unsigned long > * pKnownTables = NULL );
     json_object *                                       WriteToJSONArray    ( bool bSerialize );
     bool                                                ReadFromJSONObject  ( json_object * object, std::vector < CLuaArguments* > * pKnownTables = NULL );
diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.Utility.cpp b/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.Utility.cpp
@@ -376,13 +376,16 @@ int CLuaFunctionDefs::toJSON ( lua_State* luaVM )
     CScriptArgReader argStream ( luaVM );
     if ( !argStream.NextIsNil () )
     {
+        bool bCompact = false;
         // Read the argument
         CLuaArguments JSON;
         JSON.ReadArgument ( luaVM, 1 );
+        argStream.Skip ( 1 );
+        argStream.ReadBool ( bCompact, false );
 
         // Convert it to a JSON string
         std::string strJSON;
-        if ( JSON.WriteToJSONString ( strJSON ) )
+        if ( JSON.WriteToJSONString ( strJSON, false, bCompact ) )
         {
             // Return the JSON string
             lua_pushstring ( luaVM, strJSON.c_str () );

Original file line number	Diff line number	Diff line change
`@@ -529,12 +529,12 @@ bool CLuaArguments::WriteToBitStream ( NetBitStreamInterface& bitStream, CFastHa`
`529`	`529`	`}`
`530`	`530`
`531`	`531`
`532`		`-bool CLuaArguments::WriteToJSONString ( std::string& strJSON, bool bSerialize )`
	`532`	`+bool CLuaArguments::WriteToJSONString ( std::string& strJSON, bool bSerialize, bool bCompact )`
`533`	`533`	`{`
`534`	`534`	`json_object * my_array = WriteToJSONArray ( bSerialize );`
`535`	`535`	`if ( my_array )`
`536`	`536`	`{`
`537`		`- strJSON = json_object_get_string ( my_array );`
	`537`	`+ strJSON = json_object_to_json_string_ext ( my_array, bCompact ? JSON_C_TO_STRING_PLAIN : JSON_C_TO_STRING_SPACED );`
`538`	`538`	`json_object_put ( my_array ); // dereference - causes a crash, is actually commented out in the example too`
`539`	`539`	`return true;`
`540`	`540`	`}`
Original file line number	Diff line number	Diff line change
`@@ -589,12 +589,12 @@ bool CLuaArguments::WriteToBitStream ( NetBitStreamInterface& bitStream, CFastHa`
`589`	`589`	`}`
`590`	`590`
`591`	`591`
`592`		`-bool CLuaArguments::WriteToJSONString ( std::string& strJSON, bool bSerialize )`
	`592`	`+bool CLuaArguments::WriteToJSONString ( std::string& strJSON, bool bSerialize, bool bCompact )`
`593`	`593`	`{`
`594`	`594`	`json_object * my_array = WriteToJSONArray ( bSerialize );`
`595`	`595`	`if ( my_array )`
`596`	`596`	`{`
`597`		`- strJSON = json_object_get_string ( my_array );`
	`597`	`+ strJSON = json_object_to_json_string_ext ( my_array, bCompact ? JSON_C_TO_STRING_PLAIN : JSON_C_TO_STRING_SPACED );`
`598`	`598`	`json_object_put ( my_array ); // dereference - causes a crash, is actually commented out in the example too`
`599`	`599`	`return true;`
`600`	`600`	`}`