From f939f14774618fd07d7019e9d0c86e1e1ae5642a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 14 Jun 2021 22:06:01 +0200 Subject: Support em/code tags Some appstream-data packages add and or and to the files. Not all package manager can handle that. An example would be pamac from Manjaro --- libappstream-glib/as-node.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'libappstream-glib/as-node.c') diff --git a/libappstream-glib/as-node.c b/libappstream-glib/as-node.c index aafb16a..b4159ea 100644 --- a/libappstream-glib/as-node.c +++ b/libappstream-glib/as-node.c @@ -555,6 +555,8 @@ typedef struct { AsNode *current; AsNodeFromXmlFlags flags; const gchar * const *locales; + guint8 is_em_text; + guint8 is_code_text; } AsNodeToXmlHelper; /** @@ -604,6 +606,16 @@ as_node_start_element_cb (GMarkupParseContext *context, AsNode *current; guint i; + /* do not create a child node for em and code tags */ + if (g_strcmp0 (element_name, "em") == 0) { + helper->is_em_text = 1; + return; + } + if (g_strcmp0 (element_name, "code") == 0) { + helper->is_code_text = 1; + return; + } + /* check if we should ignore the locale */ data = g_slice_new0 (AsNodeData); @@ -662,6 +674,16 @@ as_node_end_element_cb (GMarkupParseContext *context, GError **error) { AsNodeToXmlHelper *helper = (AsNodeToXmlHelper *) user_data; + + /* do not create a child node for em and code tags */ + if (g_strcmp0 (element_name, "em") == 0) { + helper->is_em_text = 0; + return; + } + if (g_strcmp0 (element_name, "code") == 0) { + helper->is_code_text = 0; + return; + } helper->current = helper->current->parent; } @@ -695,6 +717,20 @@ as_node_text_cb (GMarkupParseContext *context, /* split up into lines and add each with spaces stripped */ if (data->cdata != NULL) { + /* support em and code tags */ + if (g_strcmp0 (as_tag_data_get_name (data), "p") == 0 || + g_strcmp0 (as_tag_data_get_name (data), "li") == 0) { + g_autoptr(GString) str = g_string_new (data->cdata); + as_ref_string_unref (data->cdata); + if (helper->is_em_text) + g_string_append_printf (str, "%s", text); + else if (helper->is_code_text) + g_string_append_printf (str, "%s", text); + else + g_string_append (str, text); + data->cdata = as_ref_string_new_with_length (str->str, str->len); + return; + } g_set_error (error, AS_NODE_ERROR, AS_NODE_ERROR_INVALID_MARKUP, -- cgit v1.2.1