From 25486a1df97db7b07b90c44033a841476e8f9d8e Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 12 Jul 2022 19:56:10 -0300 Subject: [PATCH] libmalcontent-ui: Port to libappstream Depend on libappstream-dev, and include appstream.h instead of appstream-glib.h. We can depend on a new enough version of libappstream that all the content rating symbols we need are available, which means that `gs-content-rating.[ch]` can be dropped entirely. Turns out no code changes are needed other than that. Fixes: #51 --- .gitlab-ci.yml | 2 +- .gitlab-ci/debian-unstable.Dockerfile | 2 +- README.md | 2 +- libmalcontent-ui/gs-content-rating.c | 610 -------------------------- libmalcontent-ui/gs-content-rating.h | 93 ---- libmalcontent-ui/meson.build | 10 +- libmalcontent-ui/user-controls.c | 31 +- po/POTFILES.in | 1 - 8 files changed, 21 insertions(+), 730 deletions(-) delete mode 100644 libmalcontent-ui/gs-content-rating.c delete mode 100644 libmalcontent-ui/gs-content-rating.h diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0736f96..639623a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ cache: - _ccache/ variables: - DEBIAN_IMAGE: "registry.freedesktop.org/pwithnall/malcontent/debian-unstable:v1" + DEBIAN_IMAGE: "registry.freedesktop.org/pwithnall/malcontent/debian-unstable:v2" MESON_TEST_TIMEOUT_MULTIPLIER: 2 G_MESSAGES_DEBUG: all MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload" diff --git a/.gitlab-ci/debian-unstable.Dockerfile b/.gitlab-ci/debian-unstable.Dockerfile index 717001f..6c6385b 100644 --- a/.gitlab-ci/debian-unstable.Dockerfile +++ b/.gitlab-ci/debian-unstable.Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \ gtk-doc-tools \ lcov \ libaccountsservice-dev \ - libappstream-glib-dev \ + libappstream-dev \ libflatpak-dev \ libgirepository1.0-dev \ libglib2.0-dev \ diff --git a/README.md b/README.md index 37c2088..8dbbe72 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ Dependencies ------------ * accounts-service - * appstream-glib + * appstream * dbus-daemon * flatpak * gio-2.0 ≥ 2.60 diff --git a/libmalcontent-ui/gs-content-rating.c b/libmalcontent-ui/gs-content-rating.c deleted file mode 100644 index 73e9e21..0000000 --- a/libmalcontent-ui/gs-content-rating.c +++ /dev/null @@ -1,610 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Copyright (C) 2015-2016 Richard Hughes - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include -#include -#include - -#include "gs-content-rating.h" - -#if !AS_CHECK_VERSION(0, 7, 18) -const gchar * -gs_content_rating_system_to_str (GsContentRatingSystem system) -{ - if (system == GS_CONTENT_RATING_SYSTEM_INCAA) - return "INCAA"; - if (system == GS_CONTENT_RATING_SYSTEM_ACB) - return "ACB"; - if (system == GS_CONTENT_RATING_SYSTEM_DJCTQ) - return "DJCTQ"; - if (system == GS_CONTENT_RATING_SYSTEM_GSRR) - return "GSRR"; - if (system == GS_CONTENT_RATING_SYSTEM_PEGI) - return "PEGI"; - if (system == GS_CONTENT_RATING_SYSTEM_KAVI) - return "KAVI"; - if (system == GS_CONTENT_RATING_SYSTEM_USK) - return "USK"; - if (system == GS_CONTENT_RATING_SYSTEM_ESRA) - return "ESRA"; - if (system == GS_CONTENT_RATING_SYSTEM_CERO) - return "CERO"; - if (system == GS_CONTENT_RATING_SYSTEM_OFLCNZ) - return "OFLCNZ"; - if (system == GS_CONTENT_RATING_SYSTEM_RUSSIA) - return "RUSSIA"; - if (system == GS_CONTENT_RATING_SYSTEM_MDA) - return "MDA"; - if (system == GS_CONTENT_RATING_SYSTEM_GRAC) - return "GRAC"; - if (system == GS_CONTENT_RATING_SYSTEM_ESRB) - return "ESRB"; - if (system == GS_CONTENT_RATING_SYSTEM_IARC) - return "IARC"; - return NULL; -} - -/* data obtained from https://en.wikipedia.org/wiki/Video_game_rating_system */ -static char * -get_esrb_string (const gchar *source, const gchar *translate) -{ - if (g_strcmp0 (source, translate) == 0) - return g_strdup (source); - /* TRANSLATORS: This is the formatting of English and localized name - of the rating e.g. "Adults Only (solo adultos)" */ - return g_strdup_printf (_("%s (%s)"), source, translate); -} - -/* data obtained from https://en.wikipedia.org/wiki/Video_game_rating_system */ -gchar * -gs_utils_content_rating_age_to_str (GsContentRatingSystem system, guint age) -{ - if (system == GS_CONTENT_RATING_SYSTEM_INCAA) { - if (age >= 18) - return g_strdup ("+18"); - if (age >= 13) - return g_strdup ("+13"); - return g_strdup ("ATP"); - } - if (system == GS_CONTENT_RATING_SYSTEM_ACB) { - if (age >= 18) - return g_strdup ("R18+"); - if (age >= 15) - return g_strdup ("MA15+"); - return g_strdup ("PG"); - } - if (system == GS_CONTENT_RATING_SYSTEM_DJCTQ) { - if (age >= 18) - return g_strdup ("18"); - if (age >= 16) - return g_strdup ("16"); - if (age >= 14) - return g_strdup ("14"); - if (age >= 12) - return g_strdup ("12"); - if (age >= 10) - return g_strdup ("10"); - return g_strdup ("L"); - } - if (system == GS_CONTENT_RATING_SYSTEM_GSRR) { - if (age >= 18) - return g_strdup ("限制"); - if (age >= 15) - return g_strdup ("輔15"); - if (age >= 12) - return g_strdup ("輔12"); - if (age >= 6) - return g_strdup ("保護"); - return g_strdup ("普通"); - } - if (system == GS_CONTENT_RATING_SYSTEM_PEGI) { - if (age >= 18) - return g_strdup ("18"); - if (age >= 16) - return g_strdup ("16"); - if (age >= 12) - return g_strdup ("12"); - if (age >= 7) - return g_strdup ("7"); - if (age >= 3) - return g_strdup ("3"); - return NULL; - } - if (system == GS_CONTENT_RATING_SYSTEM_KAVI) { - if (age >= 18) - return g_strdup ("18+"); - if (age >= 16) - return g_strdup ("16+"); - if (age >= 12) - return g_strdup ("12+"); - if (age >= 7) - return g_strdup ("7+"); - if (age >= 3) - return g_strdup ("3+"); - return NULL; - } - if (system == GS_CONTENT_RATING_SYSTEM_USK) { - if (age >= 18) - return g_strdup ("18"); - if (age >= 16) - return g_strdup ("16"); - if (age >= 12) - return g_strdup ("12"); - if (age >= 6) - return g_strdup ("6"); - return g_strdup ("0"); - } - /* Reference: http://www.esra.org.ir/ */ - if (system == GS_CONTENT_RATING_SYSTEM_ESRA) { - if (age >= 18) - return g_strdup ("+18"); - if (age >= 15) - return g_strdup ("+15"); - if (age >= 12) - return g_strdup ("+12"); - if (age >= 7) - return g_strdup ("+7"); - if (age >= 3) - return g_strdup ("+3"); - return NULL; - } - if (system == GS_CONTENT_RATING_SYSTEM_CERO) { - if (age >= 18) - return g_strdup ("Z"); - if (age >= 17) - return g_strdup ("D"); - if (age >= 15) - return g_strdup ("C"); - if (age >= 12) - return g_strdup ("B"); - return g_strdup ("A"); - } - if (system == GS_CONTENT_RATING_SYSTEM_OFLCNZ) { - if (age >= 18) - return g_strdup ("R18"); - if (age >= 16) - return g_strdup ("R16"); - if (age >= 15) - return g_strdup ("R15"); - if (age >= 13) - return g_strdup ("R13"); - return g_strdup ("G"); - } - if (system == GS_CONTENT_RATING_SYSTEM_RUSSIA) { - if (age >= 18) - return g_strdup ("18+"); - if (age >= 16) - return g_strdup ("16+"); - if (age >= 12) - return g_strdup ("12+"); - if (age >= 6) - return g_strdup ("6+"); - return g_strdup ("0+"); - } - if (system == GS_CONTENT_RATING_SYSTEM_MDA) { - if (age >= 18) - return g_strdup ("M18"); - if (age >= 16) - return g_strdup ("ADV"); - return get_esrb_string ("General", _("General")); - } - if (system == GS_CONTENT_RATING_SYSTEM_GRAC) { - if (age >= 18) - return g_strdup ("18"); - if (age >= 15) - return g_strdup ("15"); - if (age >= 12) - return g_strdup ("12"); - return get_esrb_string ("ALL", _("ALL")); - } - if (system == GS_CONTENT_RATING_SYSTEM_ESRB) { - if (age >= 18) - return get_esrb_string ("Adults Only", _("Adults Only")); - if (age >= 17) - return get_esrb_string ("Mature", _("Mature")); - if (age >= 13) - return get_esrb_string ("Teen", _("Teen")); - if (age >= 10) - return get_esrb_string ("Everyone 10+", _("Everyone 10+")); - if (age >= 6) - return get_esrb_string ("Everyone", _("Everyone")); - - return get_esrb_string ("Early Childhood", _("Early Childhood")); - } - /* IARC = everything else */ - if (age >= 18) - return g_strdup ("18+"); - if (age >= 16) - return g_strdup ("16+"); - if (age >= 12) - return g_strdup ("12+"); - if (age >= 7) - return g_strdup ("7+"); - if (age >= 3) - return g_strdup ("3+"); - return NULL; -} - -/* - * parse_locale: - * @locale: (transfer full): a locale to parse - * @language_out: (out) (optional) (nullable): return location for the parsed - * language, or %NULL to ignore - * @territory_out: (out) (optional) (nullable): return location for the parsed - * territory, or %NULL to ignore - * @codeset_out: (out) (optional) (nullable): return location for the parsed - * codeset, or %NULL to ignore - * @modifier_out: (out) (optional) (nullable): return location for the parsed - * modifier, or %NULL to ignore - * - * Parse @locale as a locale string of the form - * `language[_territory][.codeset][@modifier]` — see `man 3 setlocale` for - * details. - * - * On success, %TRUE will be returned, and the components of the locale will be - * returned in the given addresses, with each component not including any - * separators. Otherwise, %FALSE will be returned and the components will be set - * to %NULL. - * - * @locale is modified, and any returned non-%NULL pointers will point inside - * it. - * - * Returns: %TRUE on success, %FALSE otherwise - */ -static gboolean -parse_locale (gchar *locale /* (transfer full) */, - const gchar **language_out, - const gchar **territory_out, - const gchar **codeset_out, - const gchar **modifier_out) -{ - gchar *separator; - const gchar *language = NULL, *territory = NULL, *codeset = NULL, *modifier = NULL; - - separator = strrchr (locale, '@'); - if (separator != NULL) { - modifier = separator + 1; - *separator = '\0'; - } - - separator = strrchr (locale, '.'); - if (separator != NULL) { - codeset = separator + 1; - *separator = '\0'; - } - - separator = strrchr (locale, '_'); - if (separator != NULL) { - territory = separator + 1; - *separator = '\0'; - } - - language = locale; - - /* Parse failure? */ - if (*language == '\0') { - language = NULL; - territory = NULL; - codeset = NULL; - modifier = NULL; - } - - if (language_out != NULL) - *language_out = language; - if (territory_out != NULL) - *territory_out = territory; - if (codeset_out != NULL) - *codeset_out = codeset; - if (modifier_out != NULL) - *modifier_out = modifier; - - return (language != NULL); -} - -/* data obtained from https://en.wikipedia.org/wiki/Video_game_rating_system */ -GsContentRatingSystem -gs_utils_content_rating_system_from_locale (const gchar *locale) -{ - g_autofree gchar *locale_copy = g_strdup (locale); - const gchar *territory; - - /* Default to IARC for locales which can’t be parsed. */ - if (!parse_locale (locale_copy, NULL, &territory, NULL, NULL)) - return GS_CONTENT_RATING_SYSTEM_IARC; - - /* Argentina */ - if (g_strcmp0 (territory, "AR") == 0) - return GS_CONTENT_RATING_SYSTEM_INCAA; - - /* Australia */ - if (g_strcmp0 (territory, "AU") == 0) - return GS_CONTENT_RATING_SYSTEM_ACB; - - /* Brazil */ - if (g_strcmp0 (territory, "BR") == 0) - return GS_CONTENT_RATING_SYSTEM_DJCTQ; - - /* Taiwan */ - if (g_strcmp0 (territory, "TW") == 0) - return GS_CONTENT_RATING_SYSTEM_GSRR; - - /* Europe (but not Finland or Germany), India, Israel, - * Pakistan, Quebec, South Africa */ - if ((g_strcmp0 (territory, "GB") == 0) || - g_strcmp0 (territory, "AL") == 0 || - g_strcmp0 (territory, "AD") == 0 || - g_strcmp0 (territory, "AM") == 0 || - g_strcmp0 (territory, "AT") == 0 || - g_strcmp0 (territory, "AZ") == 0 || - g_strcmp0 (territory, "BY") == 0 || - g_strcmp0 (territory, "BE") == 0 || - g_strcmp0 (territory, "BA") == 0 || - g_strcmp0 (territory, "BG") == 0 || - g_strcmp0 (territory, "HR") == 0 || - g_strcmp0 (territory, "CY") == 0 || - g_strcmp0 (territory, "CZ") == 0 || - g_strcmp0 (territory, "DK") == 0 || - g_strcmp0 (territory, "EE") == 0 || - g_strcmp0 (territory, "FR") == 0 || - g_strcmp0 (territory, "GE") == 0 || - g_strcmp0 (territory, "GR") == 0 || - g_strcmp0 (territory, "HU") == 0 || - g_strcmp0 (territory, "IS") == 0 || - g_strcmp0 (territory, "IT") == 0 || - g_strcmp0 (territory, "LZ") == 0 || - g_strcmp0 (territory, "XK") == 0 || - g_strcmp0 (territory, "LV") == 0 || - g_strcmp0 (territory, "FL") == 0 || - g_strcmp0 (territory, "LU") == 0 || - g_strcmp0 (territory, "LT") == 0 || - g_strcmp0 (territory, "MK") == 0 || - g_strcmp0 (territory, "MT") == 0 || - g_strcmp0 (territory, "MD") == 0 || - g_strcmp0 (territory, "MC") == 0 || - g_strcmp0 (territory, "ME") == 0 || - g_strcmp0 (territory, "NL") == 0 || - g_strcmp0 (territory, "NO") == 0 || - g_strcmp0 (territory, "PL") == 0 || - g_strcmp0 (territory, "PT") == 0 || - g_strcmp0 (territory, "RO") == 0 || - g_strcmp0 (territory, "SM") == 0 || - g_strcmp0 (territory, "RS") == 0 || - g_strcmp0 (territory, "SK") == 0 || - g_strcmp0 (territory, "SI") == 0 || - g_strcmp0 (territory, "ES") == 0 || - g_strcmp0 (territory, "SE") == 0 || - g_strcmp0 (territory, "CH") == 0 || - g_strcmp0 (territory, "TR") == 0 || - g_strcmp0 (territory, "UA") == 0 || - g_strcmp0 (territory, "VA") == 0 || - g_strcmp0 (territory, "IN") == 0 || - g_strcmp0 (territory, "IL") == 0 || - g_strcmp0 (territory, "PK") == 0 || - g_strcmp0 (territory, "ZA") == 0) - return GS_CONTENT_RATING_SYSTEM_PEGI; - - /* Finland */ - if (g_strcmp0 (territory, "FI") == 0) - return GS_CONTENT_RATING_SYSTEM_KAVI; - - /* Germany */ - if (g_strcmp0 (territory, "DE") == 0) - return GS_CONTENT_RATING_SYSTEM_USK; - - /* Iran */ - if (g_strcmp0 (territory, "IR") == 0) - return GS_CONTENT_RATING_SYSTEM_ESRA; - - /* Japan */ - if (g_strcmp0 (territory, "JP") == 0) - return GS_CONTENT_RATING_SYSTEM_CERO; - - /* New Zealand */ - if (g_strcmp0 (territory, "NZ") == 0) - return GS_CONTENT_RATING_SYSTEM_OFLCNZ; - - /* Russia: Content rating law */ - if (g_strcmp0 (territory, "RU") == 0) - return GS_CONTENT_RATING_SYSTEM_RUSSIA; - - /* Singapore */ - if (g_strcmp0 (territory, "SQ") == 0) - return GS_CONTENT_RATING_SYSTEM_MDA; - - /* South Korea */ - if (g_strcmp0 (territory, "KR") == 0) - return GS_CONTENT_RATING_SYSTEM_GRAC; - - /* USA, Canada, Mexico */ - if ((g_strcmp0 (territory, "US") == 0) || - g_strcmp0 (territory, "CA") == 0 || - g_strcmp0 (territory, "MX") == 0) - return GS_CONTENT_RATING_SYSTEM_ESRB; - - /* everything else is IARC */ - return GS_CONTENT_RATING_SYSTEM_IARC; -} - -static const gchar *content_rating_strings[GS_CONTENT_RATING_SYSTEM_LAST][7] = { - { "3+", "7+", "12+", "16+", "18+", NULL }, /* GS_CONTENT_RATING_SYSTEM_UNKNOWN */ - { "ATP", "+13", "+18", NULL }, /* GS_CONTENT_RATING_SYSTEM_INCAA */ - { "PG", "MA15+", "R18+", NULL }, /* GS_CONTENT_RATING_SYSTEM_ACB */ - { "L", "10", "12", "14", "16", "18", NULL }, /* GS_CONTENT_RATING_SYSTEM_DJCTQ */ - { "普通", "保護", "輔12", "輔15", "限制", NULL }, /* GS_CONTENT_RATING_SYSTEM_GSRR */ - { "3", "7", "12", "16", "18", NULL }, /* GS_CONTENT_RATING_SYSTEM_PEGI */ - { "3+", "7+", "12+", "16+", "18+", NULL }, /* GS_CONTENT_RATING_SYSTEM_KAVI */ - { "0", "6", "12", "16", "18", NULL}, /* GS_CONTENT_RATING_SYSTEM_USK */ - { "+3", "+7", "+12", "+15", "+18", NULL }, /* GS_CONTENT_RATING_SYSTEM_ESRA */ - { "A", "B", "C", "D", "Z", NULL }, /* GS_CONTENT_RATING_SYSTEM_CERO */ - { "G", "R13", "R15", "R16", "R18", NULL }, /* GS_CONTENT_RATING_SYSTEM_OFLCNZ */ - { "0+", "6+", "12+", "16+", "18+", NULL }, /* GS_CONTENT_RATING_SYSTEM_RUSSIA */ - { "General", "ADV", "M18", NULL }, /* GS_CONTENT_RATING_SYSTEM_MDA */ - { "ALL", "12", "15", "18", NULL }, /* GS_CONTENT_RATING_SYSTEM_GRAC */ - { "Early Childhood", "Everyone", "Everyone 10+", "Teen", "Mature", "Adults Only", NULL }, /* GS_CONTENT_RATING_SYSTEM_ESRB */ - { "3+", "7+", "12+", "16+", "18+", NULL }, /* GS_CONTENT_RATING_SYSTEM_IARC */ -}; - -gchar ** -gs_utils_content_rating_get_values (GsContentRatingSystem system) -{ - g_return_val_if_fail ((int) system < GS_CONTENT_RATING_SYSTEM_LAST, NULL); - - /* IARC is the fallback for everything */ - if (system == GS_CONTENT_RATING_SYSTEM_UNKNOWN) - system = GS_CONTENT_RATING_SYSTEM_IARC; - - /* ESRB is special as it requires localised suffixes */ - if (system == GS_CONTENT_RATING_SYSTEM_ESRB) { - g_auto(GStrv) esrb_ages = g_new0 (gchar *, 7); - - esrb_ages[0] = get_esrb_string (content_rating_strings[system][0], _("Early Childhood")); - esrb_ages[1] = get_esrb_string (content_rating_strings[system][1], _("Everyone")); - esrb_ages[2] = get_esrb_string (content_rating_strings[system][2], _("Everyone 10+")); - esrb_ages[3] = get_esrb_string (content_rating_strings[system][3], _("Teen")); - esrb_ages[4] = get_esrb_string (content_rating_strings[system][4], _("Mature")); - esrb_ages[5] = get_esrb_string (content_rating_strings[system][5], _("Adults Only")); - esrb_ages[6] = NULL; - - return g_steal_pointer (&esrb_ages); - } - - return g_strdupv ((gchar **) content_rating_strings[system]); -} - -static guint content_rating_ages[GS_CONTENT_RATING_SYSTEM_LAST][7] = { - { 3, 7, 12, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_UNKNOWN */ - { 0, 13, 18 }, /* GS_CONTENT_RATING_SYSTEM_INCAA */ - { 0, 15, 18 }, /* GS_CONTENT_RATING_SYSTEM_ACB */ - { 0, 10, 12, 14, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_DJCTQ */ - { 0, 6, 12, 15, 18 }, /* GS_CONTENT_RATING_SYSTEM_GSRR */ - { 3, 7, 12, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_PEGI */ - { 3, 7, 12, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_KAVI */ - { 0, 6, 12, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_USK */ - { 3, 7, 12, 15, 18 }, /* GS_CONTENT_RATING_SYSTEM_ESRA */ - { 0, 12, 15, 17, 18 }, /* GS_CONTENT_RATING_SYSTEM_CERO */ - { 0, 13, 15, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_OFLCNZ */ - { 0, 6, 12, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_RUSSIA */ - { 0, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_MDA */ - { 0, 12, 15, 18 }, /* GS_CONTENT_RATING_SYSTEM_GRAC */ - { 0, 6, 10, 13, 17, 18 }, /* GS_CONTENT_RATING_SYSTEM_ESRB */ - { 3, 7, 12, 16, 18 }, /* GS_CONTENT_RATING_SYSTEM_IARC */ -}; - -const guint * -gs_utils_content_rating_get_ages (GsContentRatingSystem system, gsize *length_out) -{ - g_return_val_if_fail ((int) system < GS_CONTENT_RATING_SYSTEM_LAST, NULL); - g_return_val_if_fail (length_out != NULL, NULL); - - /* IARC is the fallback for everything */ - if (system == GS_CONTENT_RATING_SYSTEM_UNKNOWN) - system = GS_CONTENT_RATING_SYSTEM_IARC; - - *length_out = g_strv_length ((gchar **) content_rating_strings[system]); - return content_rating_ages[system]; -} - -typedef enum -{ - OARS_1_0, - OARS_1_1, -} OarsVersion; - -/* The struct definition below assumes we don’t grow more - * #AsContentRating values. */ -G_STATIC_ASSERT (AS_CONTENT_RATING_VALUE_LAST == AS_CONTENT_RATING_VALUE_INTENSE + 1); - -static const struct { - const gchar *id; - OarsVersion oars_version; /* when the key was first added */ - guint csm_age_none; /* for %AS_CONTENT_RATING_VALUE_NONE */ - guint csm_age_mild; /* for %AS_CONTENT_RATING_VALUE_MILD */ - guint csm_age_moderate; /* for %AS_CONTENT_RATING_VALUE_MODERATE */ - guint csm_age_intense; /* for %AS_CONTENT_RATING_VALUE_INTENSE */ -} oars_to_csm_mappings[] = { - /* Each @id must only appear once. The set of @csm_age_* values for a - * given @id must be complete and non-decreasing. */ - /* v1.0 */ - { "violence-cartoon", OARS_1_0, 0, 3, 4, 6 }, - { "violence-fantasy", OARS_1_0, 0, 3, 7, 8 }, - { "violence-realistic", OARS_1_0, 0, 4, 9, 14 }, - { "violence-bloodshed", OARS_1_0, 0, 9, 11, 18 }, - { "violence-sexual", OARS_1_0, 0, 18, 18, 18 }, - { "drugs-alcohol", OARS_1_0, 0, 11, 13, 16 }, - { "drugs-narcotics", OARS_1_0, 0, 12, 14, 17 }, - { "drugs-tobacco", OARS_1_0, 0, 10, 13, 13 }, - { "sex-nudity", OARS_1_0, 0, 12, 14, 14 }, - { "sex-themes", OARS_1_0, 0, 13, 14, 15 }, - { "language-profanity", OARS_1_0, 0, 8, 11, 14 }, - { "language-humor", OARS_1_0, 0, 3, 8, 14 }, - { "language-discrimination", OARS_1_0, 0, 9, 10, 11 }, - { "money-advertising", OARS_1_0, 0, 7, 8, 10 }, - { "money-gambling", OARS_1_0, 0, 7, 10, 18 }, - { "money-purchasing", OARS_1_0, 0, 12, 14, 15 }, - { "social-chat", OARS_1_0, 0, 4, 10, 13 }, - { "social-audio", OARS_1_0, 0, 15, 15, 15 }, - { "social-contacts", OARS_1_0, 0, 12, 12, 12 }, - { "social-info", OARS_1_0, 0, 0, 13, 13 }, - { "social-location", OARS_1_0, 0, 13, 13, 13 }, - /* v1.1 additions */ - { "sex-homosexuality", OARS_1_1, 0, 13, 14, 15 }, - { "sex-prostitution", OARS_1_1, 0, 12, 14, 18 }, - { "sex-adultery", OARS_1_1, 0, 8, 10, 18 }, - { "sex-appearance", OARS_1_1, 0, 10, 10, 15 }, - { "violence-worship", OARS_1_1, 0, 13, 15, 18 }, - { "violence-desecration", OARS_1_1, 0, 13, 15, 18 }, - { "violence-slavery", OARS_1_1, 0, 13, 15, 18 }, -}; -#endif /* appstream-glib < 0.7.18 */ - -#if !AS_CHECK_VERSION(0, 7, 18) -/** - * as_content_rating_id_csm_age_to_value: - * @id: the subsection ID e.g. "violence-cartoon" - * @age: the age - * - * Gets the #MctAppFilterOarsValue for a given age. - * - * Returns: the #MctAppFilterOarsValue - **/ -MctAppFilterOarsValue -as_content_rating_id_csm_age_to_value (const gchar *id, guint age) -{ - for (gsize i = 0; G_N_ELEMENTS (oars_to_csm_mappings); i++) { - if (g_strcmp0 (id, oars_to_csm_mappings[i].id) == 0) { - if (age >= oars_to_csm_mappings[i].csm_age_intense) - return MCT_APP_FILTER_OARS_VALUE_INTENSE; - else if (age >= oars_to_csm_mappings[i].csm_age_moderate) - return MCT_APP_FILTER_OARS_VALUE_MODERATE; - else if (age >= oars_to_csm_mappings[i].csm_age_mild) - return MCT_APP_FILTER_OARS_VALUE_MILD; - else if (age >= oars_to_csm_mappings[i].csm_age_none) - return MCT_APP_FILTER_OARS_VALUE_NONE; - else - return MCT_APP_FILTER_OARS_VALUE_UNKNOWN; - } - } - - return MCT_APP_FILTER_OARS_VALUE_UNKNOWN; -} -#endif /* appstream-glib < 0.7.18 */ diff --git a/libmalcontent-ui/gs-content-rating.h b/libmalcontent-ui/gs-content-rating.h deleted file mode 100644 index b903bf4..0000000 --- a/libmalcontent-ui/gs-content-rating.h +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Copyright (C) 2015-2016 Richard Hughes - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -G_BEGIN_DECLS - -#include -#include -#include - -#if AS_CHECK_VERSION(0, 7, 18) -#define GS_CONTENT_RATING_SYSTEM_UNKNOWN AS_CONTENT_RATING_SYSTEM_UNKNOWN -#define GS_CONTENT_RATING_SYSTEM_INCAA AS_CONTENT_RATING_SYSTEM_INCAA -#define GS_CONTENT_RATING_SYSTEM_ACB AS_CONTENT_RATING_SYSTEM_ACB -#define GS_CONTENT_RATING_SYSTEM_DJCTQ AS_CONTENT_RATING_SYSTEM_DJCTQ -#define GS_CONTENT_RATING_SYSTEM_GSRR AS_CONTENT_RATING_SYSTEM_GSRR -#define GS_CONTENT_RATING_SYSTEM_PEGI AS_CONTENT_RATING_SYSTEM_PEGI -#define GS_CONTENT_RATING_SYSTEM_KAVI AS_CONTENT_RATING_SYSTEM_KAVI -#define GS_CONTENT_RATING_SYSTEM_USK AS_CONTENT_RATING_SYSTEM_USK -#define GS_CONTENT_RATING_SYSTEM_ESRA AS_CONTENT_RATING_SYSTEM_ESRA -#define GS_CONTENT_RATING_SYSTEM_CERO AS_CONTENT_RATING_SYSTEM_CERO -#define GS_CONTENT_RATING_SYSTEM_OFLCNZ AS_CONTENT_RATING_SYSTEM_OFLCNZ -#define GS_CONTENT_RATING_SYSTEM_RUSSIA AS_CONTENT_RATING_SYSTEM_RUSSIA -#define GS_CONTENT_RATING_SYSTEM_MDA AS_CONTENT_RATING_SYSTEM_MDA -#define GS_CONTENT_RATING_SYSTEM_GRAC AS_CONTENT_RATING_SYSTEM_GRAC -#define GS_CONTENT_RATING_SYSTEM_ESRB AS_CONTENT_RATING_SYSTEM_ESRB -#define GS_CONTENT_RATING_SYSTEM_IARC AS_CONTENT_RATING_SYSTEM_IARC -#define GS_CONTENT_RATING_SYSTEM_LAST AS_CONTENT_RATING_SYSTEM_LAST -#define GsContentRatingSystem AsContentRatingSystem - -#define gs_utils_content_rating_age_to_str as_content_rating_system_format_age -#define gs_utils_content_rating_system_from_locale as_content_rating_system_from_locale -#define gs_content_rating_system_to_str as_content_rating_system_to_string -#define gs_utils_content_rating_get_values as_content_rating_system_get_formatted_ages -#define gs_utils_content_rating_get_ages as_content_rating_system_get_csm_ages -#define as_content_rating_id_csm_age_to_value as_content_rating_attribute_from_csm_age -#else -typedef enum { - GS_CONTENT_RATING_SYSTEM_UNKNOWN, - GS_CONTENT_RATING_SYSTEM_INCAA, - GS_CONTENT_RATING_SYSTEM_ACB, - GS_CONTENT_RATING_SYSTEM_DJCTQ, - GS_CONTENT_RATING_SYSTEM_GSRR, - GS_CONTENT_RATING_SYSTEM_PEGI, - GS_CONTENT_RATING_SYSTEM_KAVI, - GS_CONTENT_RATING_SYSTEM_USK, - GS_CONTENT_RATING_SYSTEM_ESRA, - GS_CONTENT_RATING_SYSTEM_CERO, - GS_CONTENT_RATING_SYSTEM_OFLCNZ, - GS_CONTENT_RATING_SYSTEM_RUSSIA, - GS_CONTENT_RATING_SYSTEM_MDA, - GS_CONTENT_RATING_SYSTEM_GRAC, - GS_CONTENT_RATING_SYSTEM_ESRB, - GS_CONTENT_RATING_SYSTEM_IARC, - /*< private >*/ - GS_CONTENT_RATING_SYSTEM_LAST -} GsContentRatingSystem; - -gchar *gs_utils_content_rating_age_to_str (GsContentRatingSystem system, - guint age); -GsContentRatingSystem gs_utils_content_rating_system_from_locale (const gchar *locale); -const gchar *gs_content_rating_system_to_str (GsContentRatingSystem system); -gchar **gs_utils_content_rating_get_values (GsContentRatingSystem system); -const guint *gs_utils_content_rating_get_ages (GsContentRatingSystem system, gsize *length_out); -MctAppFilterOarsValue as_content_rating_id_csm_age_to_value (const gchar *id, guint age); -#endif /* appstream-glib < 0.7.18 */ - -#if AS_CHECK_VERSION(0, 7, 15) -#define as_content_rating_id_value_to_csm_age as_content_rating_attribute_to_csm_age -#else -guint as_content_rating_id_value_to_csm_age (const gchar *id, MctAppFilterOarsValue value); -#endif /* appstream-glib < 0.7.15 */ - -G_END_DECLS diff --git a/libmalcontent-ui/meson.build b/libmalcontent-ui/meson.build index d96ca18..9df7b91 100644 --- a/libmalcontent-ui/meson.build +++ b/libmalcontent-ui/meson.build @@ -12,7 +12,6 @@ resources = gnome.compile_resources( ) libmalcontent_ui_sources = [ - 'gs-content-rating.c', 'restrict-applications-dialog.c', 'restrict-applications-selector.c', 'user-controls.c', @@ -23,9 +22,6 @@ libmalcontent_ui_headers = [ 'restrict-applications-selector.h', 'user-controls.h', ] -libmalcontent_ui_private_headers = [ - 'gs-content-rating.h', -] libmalcontent_ui_public_deps = [ dependency('accountsservice', version: '>= 0.6.39'), @@ -36,7 +32,7 @@ libmalcontent_ui_public_deps = [ libmalcontent_dep, ] libmalcontent_ui_private_deps = [ - dependency('appstream-glib', version: '>= 0.7.15'), + dependency('appstream', version: '>= 0.12.10'), dependency('flatpak'), ] @@ -44,7 +40,7 @@ libmalcontent_ui_private_deps = [ libmalcontent_ui_include_subdir = join_paths(libmalcontent_ui_api_name, 'libmalcontent-ui') libmalcontent_ui = library(libmalcontent_ui_api_name, - libmalcontent_ui_sources + libmalcontent_ui_headers + libmalcontent_ui_private_headers, + libmalcontent_ui_sources + libmalcontent_ui_headers, dependencies: libmalcontent_ui_public_deps + libmalcontent_ui_private_deps, include_directories: root_inc, install: true, @@ -72,7 +68,7 @@ pkgconfig.generate(libmalcontent_ui, ) libmalcontent_ui_gir = gnome.generate_gir(libmalcontent_ui, - sources: libmalcontent_ui_sources + libmalcontent_ui_headers + libmalcontent_ui_private_headers, + sources: libmalcontent_ui_sources + libmalcontent_ui_headers, nsversion: libmalcontent_ui_api_version, namespace: 'MalcontentUi', symbol_prefix: 'mct_', diff --git a/libmalcontent-ui/user-controls.c b/libmalcontent-ui/user-controls.c index ad6a3a8..cc9cd2c 100644 --- a/libmalcontent-ui/user-controls.c +++ b/libmalcontent-ui/user-controls.c @@ -22,7 +22,7 @@ #include "config.h" -#include +#include #include #include #include @@ -30,7 +30,6 @@ #include #include -#include "gs-content-rating.h" #include "restrict-applications-dialog.h" #include "user-controls.h" @@ -168,13 +167,13 @@ static const GActionEntry actions[] = { /* Auxiliary methods */ -static GsContentRatingSystem +static AsContentRatingSystem get_content_rating_system (MctUserControls *self) { if (self->user_locale == NULL) - return GS_CONTENT_RATING_SYSTEM_UNKNOWN; + return AS_CONTENT_RATING_SYSTEM_UNKNOWN; - return gs_utils_content_rating_system_from_locale (self->user_locale); + return as_content_rating_system_from_locale (self->user_locale); } static const gchar * @@ -290,7 +289,7 @@ update_restricted_apps (MctUserControls *self) static void update_categories_from_language (MctUserControls *self) { - GsContentRatingSystem rating_system; + AsContentRatingSystem rating_system; g_auto(GStrv) entries = NULL; const gchar *rating_system_str; const guint *ages; @@ -298,12 +297,12 @@ update_categories_from_language (MctUserControls *self) g_autofree gchar *disabled_action = NULL; rating_system = get_content_rating_system (self); - rating_system_str = gs_content_rating_system_to_str (rating_system); + rating_system_str = as_content_rating_system_to_string (rating_system); g_debug ("Using rating system %s", rating_system_str); - entries = gs_utils_content_rating_get_values (rating_system); - ages = gs_utils_content_rating_get_ages (rating_system, &n_ages); + entries = as_content_rating_system_get_formatted_ages (rating_system); + ages = as_content_rating_system_get_csm_ages (rating_system, &n_ages); /* Fill in the age menu */ g_menu_remove_all (self->age_menu); @@ -357,7 +356,7 @@ G_STATIC_ASSERT ((int) MCT_APP_FILTER_OARS_VALUE_INTENSE == (int) AS_CONTENT_RAT static void update_oars_level (MctUserControls *self) { - GsContentRatingSystem rating_system; + AsContentRatingSystem rating_system; g_autofree gchar *rating_age_category = NULL; guint maximum_age, selected_age; gsize i; @@ -376,7 +375,7 @@ update_oars_level (MctUserControls *self) oars_value = mct_app_filter_get_oars_value (self->filter, oars_categories[i]); all_categories_unset &= (oars_value == MCT_APP_FILTER_OARS_VALUE_UNKNOWN); - age = as_content_rating_id_value_to_csm_age (oars_categories[i], (AsContentRatingValue) oars_value); + age = as_content_rating_attribute_to_csm_age (oars_categories[i], (AsContentRatingValue) oars_value); g_debug ("OARS value for '%s': %s", oars_categories[i], oars_value_to_string (oars_value)); @@ -388,7 +387,7 @@ update_oars_level (MctUserControls *self) all_categories_unset ? "all categories unset" : "some categories set"); rating_system = get_content_rating_system (self); - rating_age_category = gs_utils_content_rating_age_to_str (rating_system, maximum_age); + rating_age_category = as_content_rating_system_format_age (rating_system, maximum_age); /* Unrestricted? */ if (rating_age_category == NULL || all_categories_unset) @@ -649,7 +648,7 @@ on_set_age_action_activated (GSimpleAction *action, GVariant *param, gpointer user_data) { - GsContentRatingSystem rating_system; + AsContentRatingSystem rating_system; MctUserControls *self; g_auto(GStrv) entries = NULL; const guint *ages; @@ -661,8 +660,8 @@ on_set_age_action_activated (GSimpleAction *action, age = g_variant_get_uint32 (param); rating_system = get_content_rating_system (self); - entries = gs_utils_content_rating_get_values (rating_system); - ages = gs_utils_content_rating_get_ages (rating_system, &n_ages); + entries = as_content_rating_system_get_formatted_ages (rating_system); + ages = as_content_rating_system_get_csm_ages (rating_system, &n_ages); /* Update the button */ if (age == oars_disabled_age) @@ -1504,7 +1503,7 @@ mct_user_controls_build_app_filter (MctUserControls *self, const gchar *oars_category; oars_category = oars_categories[i]; - oars_value = (MctAppFilterOarsValue) as_content_rating_id_csm_age_to_value (oars_category, self->selected_age); + oars_value = (MctAppFilterOarsValue) as_content_rating_attribute_from_csm_age (oars_category, self->selected_age); g_debug ("\t\t → %s: %s", oars_category, oars_value_to_string (oars_value)); diff --git a/po/POTFILES.in b/po/POTFILES.in index c683f61..97666a3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,7 +4,6 @@ accounts-service/com.endlessm.ParentalControls.policy.in libmalcontent/app-filter.c libmalcontent/manager.c libmalcontent/session-limits.c -libmalcontent-ui/gs-content-rating.c libmalcontent-ui/restrict-applications-dialog.c libmalcontent-ui/restrict-applications-dialog.ui libmalcontent-ui/restrict-applications-selector.c