Moving the JSON parsing code into the library.

1 files changed, 86 insertions, 1 deletions

diff --git a/tests/json-loader.c b/tests/json-loader.c
index c2483b6..7cfc7d9 100644
--- a/tests/json-loader.c
+++ b/tests/json-loader.c
@@ -1,4 +1,89 @@
 
 #include "json-loader.h"
 
-const gchar * myval = "FIVE";
+static void
+set_props (DbusmenuMenuitem * mi, JsonObject * node)
+{
+	if (node == NULL) return;
+
+	GList * members = NULL;
+	for (members = json_object_get_members(node); members != NULL; members = g_list_next(members)) {
+		const gchar * member = members->data;
+
+		if (!g_strcmp0(member, "id")) { continue; }
+		if (!g_strcmp0(member, "submenu")) { continue; }
+
+		JsonNode * lnode = json_object_get_member(node, member);
+		if (JSON_NODE_TYPE(lnode) != JSON_NODE_VALUE) { continue; }
+
+		GValue value = {0};
+		json_node_get_value(lnode, &value);
+		dbusmenu_menuitem_property_set_value(mi, member, &value);
+		g_value_unset(&value);
+	}
+
+	return;
+}
+
+DbusmenuMenuitem *
+dbusmenu_json_build_from_node (const JsonNode * cnode)
+{
+	JsonNode * node = (JsonNode *)cnode; /* To match the jsonglib API :( */
+
+	if (node == NULL) return NULL;
+	if (JSON_NODE_TYPE(node) != JSON_NODE_OBJECT) return NULL;
+
+	JsonObject * layout = json_node_get_object(node);
+
+	DbusmenuMenuitem * local = NULL;
+	if (json_object_has_member(layout, "id")) {
+		JsonNode * node = json_object_get_member(layout, "id");
+		g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_VALUE, NULL);
+		local = dbusmenu_menuitem_new_with_id(json_node_get_int(node));
+	} else {
+		local = dbusmenu_menuitem_new();
+	}
+
+	set_props(local, layout);
+	
+	if (json_object_has_member(layout, "submenu")) {
+		JsonNode * node = json_object_get_member(layout, "submenu");
+		g_return_val_if_fail(JSON_NODE_TYPE(node) == JSON_NODE_ARRAY, local);
+		JsonArray * array = json_node_get_array(node);
+		guint count;
+		for (count = 0; count < json_array_get_length(array); count++) {
+			DbusmenuMenuitem * child = dbusmenu_json_build_from_node(json_array_get_element(array, count));
+			if (child != NULL) {
+				dbusmenu_menuitem_child_append(local, child);
+			}
+		}
+	}
+
+	/* g_debug("Layout to menu return: 0x%X", (unsigned int)local); */
+	return local;
+}
+
+DbusmenuMenuitem *
+dbusmenu_json_build_from_file (const gchar * filename)
+{
+	JsonParser * parser = json_parser_new();
+
+	GError * error = NULL;
+	if (!json_parser_load_from_file(parser, filename, &error)) {
+		g_warning("Failed parsing file %s because: %s", filename, error->message);
+		g_error_free(error);
+		return NULL;
+	}
+
+	JsonNode * root_node = json_parser_get_root(parser);
+	if (JSON_NODE_TYPE(root_node) != JSON_NODE_OBJECT) {
+		g_warning("Root node is not an object, fail.  It's an: %s", json_node_type_name(root_node));
+		return NULL;
+	}
+
+	DbusmenuMenuitem * mi = dbusmenu_json_build_from_node(root_node);
+
+	g_object_unref(parser);
+
+	return mi;
+}