mirror of
https://git.proxmox.com/git/fwupd
synced 2025-08-09 22:49:08 +00:00
Use the same JSON schema in the database as the upload
I mistakenly told Kate there was no existing format, but of course there is, and it makes sense for the formats to be the same.
This commit is contained in:
parent
504e8db1a0
commit
48e42dce56
@ -260,14 +260,12 @@ fu_security_attr_get_result(FwupdSecurityAttr *attr)
|
|||||||
* fu_security_attrs_to_json_string() converts FuSecurityAttrs and return the
|
* fu_security_attrs_to_json_string() converts FuSecurityAttrs and return the
|
||||||
* string pointer. The converted JSON format is shown as follows:
|
* string pointer. The converted JSON format is shown as follows:
|
||||||
* {
|
* {
|
||||||
* "SecurityAttrs": {
|
* "SecurityAttributes": [
|
||||||
* "Attrs": [
|
* {
|
||||||
* {
|
* "name": "aaa",
|
||||||
* "name": "aaa",
|
* "value": "bbb"
|
||||||
* "value": "bbb"
|
* }
|
||||||
* }
|
* ]
|
||||||
* ]
|
|
||||||
* }
|
|
||||||
* }
|
* }
|
||||||
*
|
*
|
||||||
* Returns: A string and NULL on fail.
|
* Returns: A string and NULL on fail.
|
||||||
@ -303,10 +301,9 @@ fu_security_attrs_to_json(FuSecurityAttrs *attrs, JsonBuilder *builder)
|
|||||||
{
|
{
|
||||||
g_autoptr(GPtrArray) items = NULL;
|
g_autoptr(GPtrArray) items = NULL;
|
||||||
g_autoptr(GError) error = NULL;
|
g_autoptr(GError) error = NULL;
|
||||||
|
|
||||||
json_builder_begin_object(builder);
|
json_builder_begin_object(builder);
|
||||||
json_builder_set_member_name(builder, "SecurityAttrs");
|
json_builder_set_member_name(builder, "SecurityAttributes");
|
||||||
json_builder_begin_object(builder);
|
|
||||||
json_builder_set_member_name(builder, "Attrs");
|
|
||||||
json_builder_begin_array(builder);
|
json_builder_begin_array(builder);
|
||||||
items = fu_security_attrs_get_all(attrs);
|
items = fu_security_attrs_get_all(attrs);
|
||||||
for (guint i = 0; i < items->len; i++) {
|
for (guint i = 0; i < items->len; i++) {
|
||||||
@ -317,5 +314,4 @@ fu_security_attrs_to_json(FuSecurityAttrs *attrs, JsonBuilder *builder)
|
|||||||
}
|
}
|
||||||
json_builder_end_array(builder);
|
json_builder_end_array(builder);
|
||||||
json_builder_end_object(builder);
|
json_builder_end_object(builder);
|
||||||
json_builder_end_object(builder);
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user