fixed json extension conversion to ds map and improved naming of some…

… files (#2355) Signed-off-by: Saif Kandil <74428638+k0T0z@users.noreply.github.com>
enigma-dev · Aug 15, 2023 · 85c1a3a · 85c1a3a
1 parent ad33bbc
commit 85c1a3a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/CommandLine/testing/SimpleTests/json_test.sog/create.edl b/CommandLine/testing/SimpleTests/json_test.sog/create.edl
@@ -0,0 +1,17 @@
+var json = '{"entries":{"entries":[{"name":"AlEw","score":196198,"rank":1,"userID":"1234"},{"name":"El Pice","score":58158,"rank":2,"userID":"12345"},{"name":"saif","score":505,"rank":3,"userID":"12346"},{"name":"Bucciarati (Couter55)","score":336,"rank":4,"userID":"12347"},{"name":"Haiyatin","score":236,"rank":5,"userID":"12348"},{"name":"Kaito","score":137,"rank":6,"userID":"12349"},{"name":"gamesadasteam","score":96,"rank":7,"userID":"123410"},{"name":"Bashkash2013","score":7,"rank":8,"userID":"123411"},{"name":"silveradagio","score":0,"rank":9,"userID":"123412"},{"name":"HappyStarXiXi","score":0,"rank":10,"userID":"123413"}]},"event_type":"leaderboard_download","id":0,"lb_name":"","num_entries":10,"status":0}';
+
+var json_decoded = json_decode(json);
+
+gtest_assert_eq(ds_map_size(json_decoded), 6);
+
+gtest_assert_eq(ds_map_exists(json_decoded, "entries"), true);
+gtest_assert_eq(ds_map_exists(json_decoded, "lb_name"), true);
+gtest_assert_eq(ds_map_exists(json_decoded, "event_type"), true);
+gtest_assert_eq(ds_map_exists(json_decoded, "id"), true);
+gtest_assert_eq(ds_map_exists(json_decoded, "num_entries"), true);
+gtest_assert_eq(ds_map_exists(json_decoded, "status"), true);
+
+var entries = ds_map_find_value(json_decoded, "entries");
+var list = ds_map_find_value(entries, "entries");
+
+gtest_assert_eq(ds_list_size(list), 10);
diff --git a/...Tests/short_json_converter.sog/create.edl → ...impleTests/short_json_test.sog/create.edl b/...Tests/short_json_converter.sog/create.edl → ...impleTests/short_json_test.sog/create.edl
diff --git a/ENIGMAsystem/SHELL/Universal_System/Extensions/Json/json.cpp b/ENIGMAsystem/SHELL/Universal_System/Extensions/Json/json.cpp
@@ -119,9 +119,7 @@ namespace enigma_user
 
 	int RecursiveDSList(Json::Value root)
 	{
-		int jsonObject=ds_map_create();
 		int jsonArray=ds_list_create();
-		ds_map_add(jsonObject,"default",jsonArray);
 
 		for (int i=0; i<root.size(); ++i)
 		{
@@ -198,7 +196,7 @@ namespace enigma_user
 				return -1;
 			}
 		}
-		return jsonObject;
+		return jsonArray;
 	}
 
 	variant json_decode(string data)