From 55e42eb733ff7b0c9c86c405c005720b1065c450 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 23 Mar 2022 19:15:08 +0100 Subject: [PATCH 1/3] Add vcs-browser and contribute URL type --- docs/xml/metainfo-component.xml | 19 +++++++++++++++++++ src/as-enums.c | 8 ++++++++ src/as-enums.h | 4 ++++ tests/test-xmldata.c | 4 ++++ tests/test-yamldata.c | 4 ++++ 5 files changed, 39 insertions(+) diff --git a/docs/xml/metainfo-component.xml b/docs/xml/metainfo-component.xml index a79453f4..82bd62f8 100644 --- a/docs/xml/metainfo-component.xml +++ b/docs/xml/metainfo-component.xml @@ -392,6 +392,25 @@ + + + vcs-browser + + + URLs of this type should point to a webpage on which the user can browse the sourcecode. + + + + + + contribute + + + URLs of this type should point to a webpage showing information on how to contribute to + the described software project. + + + diff --git a/src/as-enums.c b/src/as-enums.c index 49293d33..25eeb4f3 100644 --- a/src/as-enums.c +++ b/src/as-enums.c @@ -91,6 +91,10 @@ as_url_kind_to_string (AsUrlKind url_kind) return "translate"; if (url_kind == AS_URL_KIND_CONTACT) return "contact"; + if (url_kind == AS_URL_KIND_VCS) + return "vcs-browser"; + if (url_kind == AS_URL_KIND_CONTRIBUTE) + return "contribute"; return "unknown"; } @@ -119,6 +123,10 @@ as_url_kind_from_string (const gchar *url_kind) return AS_URL_KIND_TRANSLATE; if (g_strcmp0 (url_kind, "contact") == 0) return AS_URL_KIND_CONTACT; + if (g_strcmp0 (url_kind, "vcs-browser") == 0) + return AS_URL_KIND_VCS; + if (g_strcmp0 (url_kind, "contribute") == 0) + return AS_URL_KIND_CONTRIBUTE; return AS_URL_KIND_UNKNOWN; } diff --git a/src/as-enums.h b/src/as-enums.h index b9cd558e..5554fb31 100644 --- a/src/as-enums.h +++ b/src/as-enums.h @@ -81,6 +81,8 @@ typedef enum { * @AS_URL_KIND_DONATION: Page with information about how to donate to the project * @AS_URL_KIND_TRANSLATE: Page with instructions on how to translate the project / submit translations. * @AS_URL_KIND_CONTACT: Contact the developers + * @AS_URL_KIND_VCS: Browse the source code + * @AS_URL_KIND_CONTRIBUTE: Help developing * * The URL type. **/ @@ -93,6 +95,8 @@ typedef enum { AS_URL_KIND_DONATION, AS_URL_KIND_TRANSLATE, AS_URL_KIND_CONTACT, + AS_URL_KIND_VCS, + AS_URL_KIND_CONTRIBUTE, /*< private >*/ AS_URL_KIND_LAST } AsUrlKind; diff --git a/tests/test-xmldata.c b/tests/test-xmldata.c index e4e69bdb..6f482b07 100644 --- a/tests/test-xmldata.c +++ b/tests/test-xmldata.c @@ -663,6 +663,8 @@ test_xml_read_url (void) " https://example.org/faq\n" " https://example.org/donate\n" " https://example.org/contact\n" + " https://example.org/source\n" + " https://example.org/contribute\n" "\n"; cpt = as_xml_test_read_data (xmldata_languages, AS_FORMAT_STYLE_METAINFO); @@ -672,6 +674,8 @@ test_xml_read_url (void) g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_FAQ), ==, "https://example.org/faq"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_DONATION), ==, "https://example.org/donate"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_CONTACT), ==, "https://example.org/contact"); + g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_VCS), ==, "https://example.org/source"); + g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_CONTRIBUTE), ==, "https://example.org/contribute"); } /** diff --git a/tests/test-yamldata.c b/tests/test-yamldata.c index c9b05753..9e265d57 100644 --- a/tests/test-yamldata.c +++ b/tests/test-yamldata.c @@ -529,6 +529,8 @@ test_yaml_read_url (void) " faq: https://example.org/faq\n" " donation: https://example.org/donate\n" " contact: https://example.org/contact\n"; + " vcs-browser: https://example.org/source\n"; + " contribute: https://example.org/contribute\n"; cpt = as_yaml_test_read_data (yamldata_urls, NULL); g_assert_cmpstr (as_component_get_id (cpt), ==, "org.example.Test"); @@ -537,6 +539,8 @@ test_yaml_read_url (void) g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_FAQ), ==, "https://example.org/faq"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_DONATION), ==, "https://example.org/donate"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_CONTACT), ==, "https://example.org/contact"); + g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_VCS), ==, "https://example.org/source"); + g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_CONTRIBUTE), ==, "https://example.org/contribute"); } /** From 936fa2eabe1112c9cbea615e0c10805348d189c7 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 23 Mar 2022 19:20:35 +0100 Subject: [PATCH 2/3] Remove ; from yamldata --- tests/test-yamldata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-yamldata.c b/tests/test-yamldata.c index 9e265d57..928b64bf 100644 --- a/tests/test-yamldata.c +++ b/tests/test-yamldata.c @@ -528,8 +528,8 @@ test_yaml_read_url (void) " homepage: https://example.org\n" " faq: https://example.org/faq\n" " donation: https://example.org/donate\n" - " contact: https://example.org/contact\n"; - " vcs-browser: https://example.org/source\n"; + " contact: https://example.org/contact\n" + " vcs-browser: https://example.org/source\n" " contribute: https://example.org/contribute\n"; cpt = as_yaml_test_read_data (yamldata_urls, NULL); From bcd94eea1c26552dbfba3e9f0db274690e459f1e Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 29 Mar 2022 22:13:35 +0200 Subject: [PATCH 3/3] Use AS_URL_KIND_VCS_BROWSER --- src/as-enums.c | 4 ++-- src/as-enums.h | 4 ++-- tests/test-xmldata.c | 2 +- tests/test-yamldata.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/as-enums.c b/src/as-enums.c index 25eeb4f3..16d89278 100644 --- a/src/as-enums.c +++ b/src/as-enums.c @@ -91,7 +91,7 @@ as_url_kind_to_string (AsUrlKind url_kind) return "translate"; if (url_kind == AS_URL_KIND_CONTACT) return "contact"; - if (url_kind == AS_URL_KIND_VCS) + if (url_kind == AS_URL_KIND_VCS_BROWSER) return "vcs-browser"; if (url_kind == AS_URL_KIND_CONTRIBUTE) return "contribute"; @@ -124,7 +124,7 @@ as_url_kind_from_string (const gchar *url_kind) if (g_strcmp0 (url_kind, "contact") == 0) return AS_URL_KIND_CONTACT; if (g_strcmp0 (url_kind, "vcs-browser") == 0) - return AS_URL_KIND_VCS; + return AS_URL_KIND_VCS_BROWSER; if (g_strcmp0 (url_kind, "contribute") == 0) return AS_URL_KIND_CONTRIBUTE; return AS_URL_KIND_UNKNOWN; diff --git a/src/as-enums.h b/src/as-enums.h index 5554fb31..80a84037 100644 --- a/src/as-enums.h +++ b/src/as-enums.h @@ -81,7 +81,7 @@ typedef enum { * @AS_URL_KIND_DONATION: Page with information about how to donate to the project * @AS_URL_KIND_TRANSLATE: Page with instructions on how to translate the project / submit translations. * @AS_URL_KIND_CONTACT: Contact the developers - * @AS_URL_KIND_VCS: Browse the source code + * @AS_URL_KIND_VCS_BROWSER: Browse the source code * @AS_URL_KIND_CONTRIBUTE: Help developing * * The URL type. @@ -95,7 +95,7 @@ typedef enum { AS_URL_KIND_DONATION, AS_URL_KIND_TRANSLATE, AS_URL_KIND_CONTACT, - AS_URL_KIND_VCS, + AS_URL_KIND_VCS_BROWSER, AS_URL_KIND_CONTRIBUTE, /*< private >*/ AS_URL_KIND_LAST diff --git a/tests/test-xmldata.c b/tests/test-xmldata.c index 6f482b07..11a19be6 100644 --- a/tests/test-xmldata.c +++ b/tests/test-xmldata.c @@ -674,7 +674,7 @@ test_xml_read_url (void) g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_FAQ), ==, "https://example.org/faq"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_DONATION), ==, "https://example.org/donate"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_CONTACT), ==, "https://example.org/contact"); - g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_VCS), ==, "https://example.org/source"); + g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_VCS_BROWSER), ==, "https://example.org/source"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_CONTRIBUTE), ==, "https://example.org/contribute"); } diff --git a/tests/test-yamldata.c b/tests/test-yamldata.c index 928b64bf..e3a1d3ed 100644 --- a/tests/test-yamldata.c +++ b/tests/test-yamldata.c @@ -539,7 +539,7 @@ test_yaml_read_url (void) g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_FAQ), ==, "https://example.org/faq"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_DONATION), ==, "https://example.org/donate"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_CONTACT), ==, "https://example.org/contact"); - g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_VCS), ==, "https://example.org/source"); + g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_VCS_BROWSER), ==, "https://example.org/source"); g_assert_cmpstr (as_component_get_url (cpt, AS_URL_KIND_CONTRIBUTE), ==, "https://example.org/contribute"); }