[gnome-software] Move the featured apps from XML to a plugin
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Move the featured apps from XML to a plugin
- Date: Fri, 27 May 2016 07:17:38 +0000 (UTC)
commit c1f86701dc843db4bbaf003452df2af87aa63c49
Author: Richard Hughes <richard hughsie com>
Date: Thu May 26 18:56:14 2016 +0100
Move the featured apps from XML to a plugin
Relying on AsStore to merge the applications breaks hard when we're using a
mixture of native and flatpak bundles.
contrib/gnome-software.spec.in | 1 -
data/Makefile.am | 15 --
data/org.gnome.Software-featured.xml | 196 ------------------------
src/plugins/Makefile.am | 6 +
src/plugins/gs-plugin-hardcoded-featured.c | 225 ++++++++++++++++++++++++++++
5 files changed, 231 insertions(+), 212 deletions(-)
---
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 833bb6e..3c9aa16 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -120,7 +120,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%dir %{_datadir}/gnome-software
%{_datadir}/gnome-software/*.png
%{_datadir}/appdata/*.appdata.xml
-%{_datadir}/app-info/xmls/*.xml.gz
%{_mandir}/man1/gnome-software.1.gz
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/gnome-software/featured-*.svg
diff --git a/data/Makefile.am b/data/Makefile.am
index e2b60d6..c98888a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,14 +3,6 @@ SUBDIRS = \
tests \
icons
-appstreamdir = $(datadir)/app-info/xmls
-appstream_DATA = org.gnome.Software.xml.gz
-appstream_files = \
- org.gnome.Software-featured.xml
-org.gnome.Software.xml.gz: $(appstream_files)
- $(AM_V_GEN) appstream-util merge-appstream $@ \
- $(srcdir)/org.gnome.Software-*.xml
-
resourcesdir = $(datadir)/gnome-software
dist_resources_DATA = \
upgrade-bg.png \
@@ -47,14 +39,7 @@ install-sample-data:
rm fedora-20-icons.tar.gz; \
cd -
-BUILT_SOURCES = \
- org.gnome.Software.xml.gz
-
-CLEANFILES = \
- $(BUILT_SOURCES)
-
EXTRA_DIST = \
- $(appstream_files) \
$(gsettings_SCHEMAS)
MAINTAINERCLEANFILES = \
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 9deef91..56de54c 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -34,6 +34,7 @@ plugin_LTLIBRARIES = \
libgs_plugin_dpkg.la \
libgs_plugin_hardcoded-blacklist.la \
libgs_plugin_hardcoded-popular.la \
+ libgs_plugin_hardcoded-featured.la \
libgs_plugin_menu-spec-categories.la \
libgs_plugin_menu-spec-refine.la \
libgs_plugin_fedora-distro-upgrades.la \
@@ -224,6 +225,11 @@ libgs_plugin_hardcoded_popular_la_LIBADD = $(GS_PLUGIN_LIBS)
libgs_plugin_hardcoded_popular_la_LDFLAGS = -module -avoid-version
libgs_plugin_hardcoded_popular_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+libgs_plugin_hardcoded_featured_la_SOURCES = gs-plugin-hardcoded-featured.c
+libgs_plugin_hardcoded_featured_la_LIBADD = $(GS_PLUGIN_LIBS)
+libgs_plugin_hardcoded_featured_la_LDFLAGS = -module -avoid-version
+libgs_plugin_hardcoded_featured_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+
if HAVE_UBUNTU_REVIEWS
libgs_plugin_ubuntu_reviews_la_SOURCES = \
gs-plugin-ubuntu-reviews.c
diff --git a/src/plugins/gs-plugin-hardcoded-featured.c b/src/plugins/gs-plugin-hardcoded-featured.c
new file mode 100644
index 0000000..1cc3fd7
--- /dev/null
+++ b/src/plugins/gs-plugin-hardcoded-featured.c
@@ -0,0 +1,225 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2016 Richard Hughes <richard hughsie com>
+ *
+ * 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 <gnome-software.h>
+
+void
+gs_plugin_initialize (GsPlugin *plugin)
+{
+ /* let appstream add applications first */
+ gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
+}
+
+gboolean
+gs_plugin_add_featured (GsPlugin *plugin,
+ GsAppList *list,
+ GCancellable *cancellable,
+ GError **error)
+{
+ guint i;
+ struct {
+ const gchar *id;
+ const gchar *css;
+ } apps[] = {
+ { "ardour2.desktop",
+ "border-color: #333333;\n"
+ "text-shadow: 0 1px 1px rgba(0,0,0,0.5);\n"
+ "color: #ffffff;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#ffffff, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-ardour.png')"
+ " 30% 49% / 33% no-repeat,"
+ " url('@datadir@/gnome-software/featured-ardour-bg.png')"
+ " center center / 100% auto no-repeat,"
+ " linear-gradient(to bottom, #373936, #60625e);" },
+ { "blender.desktop",
+ "border-color: #783d03;\n"
+ "text-shadow: 0 1px 1px rgba(0,0,0,0.5);\n"
+ "color: #ffffff;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#ffffff, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-blender.png')"
+ " 10% 40% / 50% auto no-repeat, -gtk-gradient (radial,"
+ " center bottom, 0, center center, 1,"
+ " from(#fcbf83), to(#c06105));" },
+ { "gnome-chess.desktop",
+ "border-color: #2e3436;\n"
+ "text-shadow: 0 1px 1px rgba(0,0,0,0.5);\n"
+ "color: #ffffff;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#ffffff, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-chess.png')"
+ " 10% center / 40% auto no-repeat,"
+ " linear-gradient(to bottom, #555753, #888a85);" },
+ { "firefox.desktop",
+ "border-color: #babdb6;\n"
+ "text-shadow: 0 1px 1px rgba(255,255,255,0.7);\n"
+ "color: #888a85;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#888a85, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-firefox.png')"
+ " 10% center / 40% auto no-repeat,"
+ " linear-gradient(to bottom, #d3d7cf, #eeeeec);" },
+ { "gimp.desktop",
+ "border-color: #2a6c10;\n"
+ "text-shadow: 0 1px 1px rgba(255,255,255,0.7);\n"
+ "color: #333;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#333, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-gimp.png')"
+ " left 50% / 50% auto no-repeat,"
+ " linear-gradient(to bottom, #8ac674, #cbddc3);" },
+ { "inkscape.desktop",
+ "border-color: #819a6b;\n"
+ "text-shadow: 0 1px 3px rgba(0,0,0,0.9),0 1px 2px rgba(0,0,0,0.7);\n"
+ "color: #ffffff;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#ffffff, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ " background:"
+ " url('@datadir@/gnome-software/featured-inkscape.png')"
+ " 20% / 60% auto no-repeat,"
+ " linear-gradient(to bottom, #ccd6c3, #a7b797);" },
+ { "mypaint.desktop",
+ "border-color: #4c52aa;\n"
+ "color: #362d89;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#362d89, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-mypaint.png')"
+ " left 67% / 50% auto no-repeat,"
+ " linear-gradient(to bottom, #8fa5d9, #d8e0ef);" },
+ { "org.gnome.Polari.desktop",
+ "border-color: #4e9a06;\n"
+ "text-shadow: 0 2px #418e64;\n"
+ "color: #a8c74f;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#a8c74f, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-polari.svg')"
+ " 70% 80% / 120% auto no-repeat, #43a570;" },
+ { "org.gnome.Weather.Application.desktop",
+ "border-color: #d8e0ef;\n"
+ "text-shadow: 0 1px 1px rgba(0,0,0,0.5);\n"
+ "color: #ffffff;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#ffffff, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-weather.png')"
+ " left 80% / 50% auto no-repeat,"
+ " url('@datadir@/gnome-software/featured-weather-bg.png'),"
+ " linear-gradient(to bottom, #25486d, #6693ce);" },
+ { "transmission-gtk.desktop",
+ "border-color: #a40000;\n"
+ "text-shadow: 0 1px 1px rgba(0,0,0,0.5);\n"
+ "color: #ffffff;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#ffffff, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-transmission.png')"
+ " 10% 20% / 427px auto no-repeat, -gtk-gradient (radial,"
+ " center bottom, 0, center center, 0.8,"
+ " from(#ffc124), to(#b75200));" },
+ { "Xorg.gnome.Builder.desktop",
+ "border-color: #000000;\n"
+ "text-shadow: 0 1px 1px rgba(0,0,0,0.5);\n"
+ "color: #ffffff;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#ffffff, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-builder.png')"
+ " left center / 100% auto no-repeat,"
+ " url('@datadir@/gnome-software/featured-builder-bg.jpg')"
+ " center / cover no-repeat;" },
+ { "org.gnome.Maps.desktop",
+ "border-color: #ff0000;\n"
+ "text-shadow: 0 1px 1px rgba(255,255,255,0.5);\n"
+ "color: #000000;\n"
+ "-GtkWidget-focus-padding: 0;\n"
+ "outline-color: alpha(#000000, 0.75);\n"
+ "outline-style: dashed;\n"
+ "outline-offset: 2px;\n"
+ "background:"
+ " url('@datadir@/gnome-software/featured-maps.png')"
+ " left -10px / 352px auto no-repeat,"
+ " url('@datadir@/gnome-software/featured-maps-bg.png')"
+ " bottom center / contain no-repeat;" },
+ { NULL, NULL }
+ };
+
+ /* we've already got enough featured apps */
+ if (gs_app_list_length (list) >= 5)
+ return TRUE;
+
+ /* just add all */
+ g_debug ("using hardcoded as only %i apps", gs_app_list_length (list));
+ for (i = 0; apps[i].id != NULL; i++) {
+ g_autoptr(GsApp) app = NULL;
+
+ /* look in the cache */
+ app = gs_plugin_cache_lookup (plugin, apps[i].id);
+ if (app != NULL) {
+ gs_app_list_add (list, app);
+ continue;
+ }
+
+ /* create new */
+ app = gs_app_new (apps[i].id);
+ gs_app_add_quirk (app, AS_APP_QUIRK_MATCH_ANY_PREFIX);
+ gs_app_set_metadata (app, "GnomeSoftware::Creator",
+ gs_plugin_get_name (plugin));
+ gs_app_set_metadata (app, "GnomeSoftware::FeatureTile-css",
+ apps[i].css);
+ gs_app_list_add (list, app);
+
+ /* save in the cache */
+ gs_plugin_cache_add (plugin, apps[i].id, app);
+ }
+ return TRUE;
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
