marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support parsing sources files as yaml 

Fixes #297.

Closes: #298
Approved by: alexlarsson
auto
Ryan Gonzalez 2019-08-01 12:32:39 -05:00 committed by Atomic Bot
parent d5afdbccf8
commit b317081048
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/builder-module.c
View File

@ -749,7 +749,7 @@ load_sources_from_json (const char *sources_relpath)
}
builder_manifest_set_demarshal_base_dir (sources_file_dir);
sources_root = json_from_string (sources_json, &error);
sources_root = builder_json_node_from_data (sources_path, sources_json, &error);
if (sources_root == NULL)
{
g_printerr ("Error parsing %s: %s\n", sources_relpath, error->message);

24
src/builder-utils.c
View File

@ -509,22 +509,28 @@ parse_yaml_to_json (const gchar *contents,
#endif // FLATPAK_BUILDER_ENABLE_YAML
JsonNode *
builder_json_node_from_data (const char *relpath,
const char *contents,
GError **error)
{
if (g_str_has_suffix (relpath, ".yaml") || g_str_has_suffix (relpath, ".yml"))
return parse_yaml_to_json (contents, error);
else
return json_from_string (contents, error);
}
GObject *
builder_gobject_from_data (GType gtype,
const char *relpath,
const char *contents,
GError **error)
{
if (g_str_has_suffix (relpath, ".yaml") || g_str_has_suffix (relpath, ".yml"))
{
g_autoptr(JsonNode) json = parse_yaml_to_json (contents, error);
if (json != NULL)
return json_gobject_deserialize (gtype, json);
else
return NULL;
}
g_autoptr(JsonNode) json = builder_json_node_from_data (relpath, contents, error);
if (json != NULL)
return json_gobject_deserialize (gtype, json);
else
return json_gobject_from_data (gtype, contents, -1, error);
return NULL;
}
/*

4
src/builder-utils.h
View File

@ -68,6 +68,10 @@ GQuark builder_curl_error_quark (void);
GQuark builder_yaml_parse_error_quark (void);
#define BUILDER_YAML_PARSE_ERROR (builder_yaml_parse_error_quark ())
JsonNode * builder_json_node_from_data (const char *relpath,
const char *contents,
GError **error);
GObject * builder_gobject_from_data (GType gtype,
const char *relpath,
const char *contents,