1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
From: =?utf-8?q?Philip_M=C3=BCller?= <philm@manjaro.org>
Date: Mon, 14 Jun 2021 22:06:01 +0200
Subject: Support em/code tags
Some appstream-data packages add <em> and </em> or <code> and </code>
to the files. Not all package manager can handle that. An example would
be pamac from Manjaro
Origin: https://github.com/hughsie/appstream-glib/pull/403
Applied-upstream: 0.8.0, commit:f939f14774618fd07d7019e9d0c86e1e1ae5642a
Bug-Debian: https://bugs.debian.org/1037206
---
libappstream-glib/as-node.c | 36 ++++++++++++++++++++++++++++++++++++
libappstream-glib/as-self-test.c | 16 ++++++++++++++++
2 files changed, 52 insertions(+)
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, "<em>%s</em>", text);
+ else if (helper->is_code_text)
+ g_string_append_printf (str, "<code>%s</code>", 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,
diff --git a/libappstream-glib/as-self-test.c b/libappstream-glib/as-self-test.c
index 78af947..3886e4b 100644
--- a/libappstream-glib/as-self-test.c
+++ b/libappstream-glib/as-self-test.c
@@ -2861,6 +2861,11 @@ as_test_node_xml_func (void)
"<!-- this documents bar -->"
"<bar key=\"value\">baz</bar>"
"</foo>";
+ const gchar *valid_em_code = "<description>"
+ "<p>"
+ "It now also supports <em>em</em> and <code>code</code> tags."
+ "</p>"
+ "</description>";
GError *error = NULL;
AsNode *n2;
AsNode *root;
@@ -2924,6 +2929,17 @@ as_test_node_xml_func (void)
g_string_free (xml, TRUE);
as_node_unref (root);
+ /* support em and code tags */
+ root = as_node_from_xml (valid_em_code, 0, &error);
+ g_assert_no_error (error);
+ g_assert (root != NULL);
+
+ n2 = as_node_find (root, "description/p");
+ g_assert (n2 != NULL);
+ printf ("<%s>\n", as_node_get_data (n2));
+ g_assert_cmpstr (as_node_get_data (n2), ==, "It now also supports<em>em</em> and <code>code</code> tags.");
+ as_node_unref (root);
+
/* keep comments */
root = as_node_from_xml (valid,
AS_NODE_FROM_XML_FLAG_KEEP_COMMENTS,
|
