Skip to content
GitLab
Commit ea5eb222 authored by Richard Hughes's avatar Richard Hughes
Browse files

Remove webapp support 

We've had long-running issues with the web apps, as evidenced by the poor
reviews they get. The main issue seems to be that people don't know what they
are when they install them, which leads to disappointment.

Fixes #862
parent 056450b0
Pipeline #136585 passed with stage
in 2 minutes and 38 seconds
Hide whitespace changes
Inline Side-by-side
contrib/gnome-software.spec.in
View file @ ea5eb222
......@@ -50,9 +50,6 @@ BuildRequires: libgudev1-devel
BuildRequires: valgrind-devel
Requires: appstream-data
%if 0%{?fedora}
Requires: epiphany-runtime
%endif
Requires: flatpak%{?_isa} >= %{flatpak_version}
Requires: flatpak-libs%{?_isa} >= %{flatpak_version}
Requires: fwupd%{?_isa} >= %{fwupd_version}
......@@ -151,7 +148,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/gnome-software/featured-*.svg
%{_datadir}/gnome-software/featured-*.jpg
%{_datadir}/metainfo/org.gnome.Software.appdata.xml
%{_datadir}/metainfo/org.gnome.Software.Plugin.Epiphany.metainfo.xml
%{_datadir}/metainfo/org.gnome.Software.Plugin.Flatpak.metainfo.xml
%{_datadir}/metainfo/org.gnome.Software.Plugin.Fwupd.metainfo.xml
%{_datadir}/metainfo/org.gnome.Software.Plugin.Odrs.metainfo.xml
......@@ -160,7 +156,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-categories.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-menu-path.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dummy.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_epiphany.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-pkgdb-collections.so
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak.so
......
meson_options.txt
View file @ ea5eb222
......@@ -12,7 +12,6 @@ option('malcontent', type : 'boolean', value : true, description : 'enable paren
option('rpm_ostree', type : 'boolean', value : false, description : 'enable rpm-ostree support')
option('shell_extensions', type : 'boolean', value : true, description : 'enable shell extensions support')
option('odrs', type : 'boolean', value : true, description : 'enable ODRS support')
option('webapps', type : 'boolean', value : true, description : 'enable webapps support')
option('gudev', type : 'boolean', value : true, description : 'enable GUdev support')
option('snap', type : 'boolean', value : false, description : 'enable Snap support')
option('external_appstream', type : 'boolean', value : false, description : 'enable external AppStream support')
......
plugins/epiphany/gs-plugin-epiphany.c deleted 100644 → 0
View file @ 056450b0
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
*
* Copyright (C) 2013-2014 Richard Hughes <richard@hughsie.com>
* Copyright (C) 2015 Kalev Lember <klember@redhat.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <config.h>
#include <string.h>
#include <gnome-software.h>
/*
* SECTION:
* Uses epiphany to launch web applications.
*
* If the epiphany binary is not present then it self-disables.
*/
void
gs_plugin_initialize (GsPlugin *plugin)
{
g_autofree gchar *epiphany = NULL;
/* we can only work with epiphany */
epiphany = g_find_program_in_path ("epiphany");
if (epiphany == NULL) {
gs_plugin_set_enabled (plugin, FALSE);
g_debug ("disabling '%s' as epiphany does not exist",
gs_plugin_get_name (plugin));
}
/* set name of MetaInfo file */
gs_plugin_set_appstream_id (plugin, "org.gnome.Software.Plugin.Epiphany");
/* need help from appstream */
gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_RUN_AFTER, "appstream");
}
void
gs_plugin_adopt_app (GsPlugin *plugin, GsApp *app)
{
if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP &&
gs_app_get_bundle_kind (app) != AS_BUNDLE_KIND_PACKAGE) {
gs_app_set_management_plugin (app, gs_plugin_get_name (plugin));
}
}
static gchar *
_gs_app_get_id_nonfull (GsApp *app)
{
gchar *id;
gchar *tmp;
id = g_strdup (gs_app_get_id (app));
tmp = g_strrstr (id, ".desktop");
if (tmp != NULL)
*tmp = '\0';
return id;
}
gboolean
gs_plugin_app_install (GsPlugin *plugin, GsApp *app,
GCancellable *cancellable, GError **error)
{
AsIcon *icon;
GPtrArray *icons;
gboolean ret = TRUE;
gsize kf_length;
g_autoptr(GError) error_local = NULL;
g_autofree gchar *app_desktop = NULL;
g_autofree gchar *epi_desktop = NULL;
g_autofree gchar *epi_dir = NULL;
g_autofree gchar *epi_icon = NULL;
g_autofree gchar *exec = NULL;
g_autofree gchar *hash = NULL;
g_autofree gchar *id_nonfull = NULL;
g_autofree gchar *kf_data = NULL;
g_autofree gchar *wmclass = NULL;
g_autoptr(GKeyFile) kf = NULL;
g_autoptr(GFile) symlink_desktop = NULL;
g_autoptr(GFile) symlink_icon = NULL;
const gchar *url = NULL;
/* only process this app if was created by this plugin */
if (g_strcmp0 (gs_app_get_management_plugin (app),
gs_plugin_get_name (plugin)) != 0)
return TRUE;
/* create the correct directory */
id_nonfull = _gs_app_get_id_nonfull (app);
hash = g_compute_checksum_for_string (G_CHECKSUM_SHA1, gs_app_get_name (app), -1);
epi_dir = g_strdup_printf ("%s/epiphany/app-%s-%s",
g_get_user_config_dir (),
id_nonfull,
hash);
g_mkdir_with_parents (epi_dir, 0755);
/* symlink icon */
epi_icon = g_build_filename (epi_dir, "app-icon.png", NULL);
symlink_icon = g_file_new_for_path (epi_icon);
icons = gs_app_get_icons (app);
if (icons->len == 0) {
g_set_error (error,
GS_PLUGIN_ERROR,
GS_PLUGIN_ERROR_NOT_SUPPORTED,
"no icons for %s",
gs_app_get_id (app));
return FALSE;
}
icon = g_ptr_array_index (icons, 0);
if (as_icon_get_filename (icon) == NULL) {
g_set_error (error,
GS_PLUGIN_ERROR,
GS_PLUGIN_ERROR_NOT_SUPPORTED,
"no filename for icon %s",
as_icon_get_name (icon));
return FALSE;
}
ret = g_file_make_symbolic_link (symlink_icon,
as_icon_get_filename (icon),
NULL,
&error_local);
if (!ret) {
if (g_error_matches (error_local, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
g_debug ("ignoring icon symlink failure: %s",
error_local->message);
} else {
g_set_error (error,
GS_PLUGIN_ERROR,
GS_PLUGIN_ERROR_WRITE_FAILED,
"Can't symlink icon: %s",
error_local->message);
return FALSE;
}
}
/* add desktop file */
wmclass = g_strdup_printf ("%s-%s", id_nonfull, hash);
kf = g_key_file_new ();
g_key_file_set_string (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_NAME,
gs_app_get_name (app));
g_key_file_set_string (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_COMMENT,
gs_app_get_summary (app));
url = gs_app_get_launchable (app, AS_LAUNCHABLE_KIND_URL);
if (url == NULL)
url = gs_app_get_url (app, AS_URL_KIND_HOMEPAGE);
exec = g_strdup_printf ("epiphany --application-mode --profile=\"%s\" %s",
epi_dir,
url);
g_key_file_set_string (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_EXEC,
exec);
g_key_file_set_boolean (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY,
TRUE);
g_key_file_set_boolean (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_TERMINAL,
FALSE);
g_key_file_set_boolean (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY,
FALSE);
g_key_file_set_string (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_TYPE,
G_KEY_FILE_DESKTOP_TYPE_APPLICATION);
g_key_file_set_string (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_ICON,
epi_icon);
g_key_file_set_string (kf,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS,
wmclass);
/* save keyfile */
kf_data = g_key_file_to_data (kf, &kf_length, error);
if (kf_data == NULL)
return FALSE;
epi_desktop = g_strdup_printf ("%s/%s.desktop", epi_dir, wmclass);
if (!g_file_set_contents (epi_desktop, kf_data, (gssize) kf_length, error))
return FALSE;
/* symlink it to somewhere the shell will notice */
app_desktop = g_build_filename (g_get_user_data_dir (),
"applications",
gs_app_get_id (app),
NULL);
symlink_desktop = g_file_new_for_path (app_desktop);
ret = g_file_make_symbolic_link (symlink_desktop,
epi_desktop,
NULL,
error);
if (!ret) {
gs_utils_error_convert_gio (error);
return FALSE;
}
/* update state */
gs_app_set_state (app, AS_APP_STATE_INSTALLING);
gs_app_set_state (app, AS_APP_STATE_INSTALLED);
return TRUE;
}
gboolean
gs_plugin_app_remove (GsPlugin *plugin, GsApp *app,
GCancellable *cancellable, GError **error)
{
const gchar *epi_desktop;
g_autofree gchar *app_desktop = NULL;
g_autoptr(GFile) file_epi = NULL;
g_autoptr(GFile) file_app = NULL;
/* only process this app if was created by this plugin */
if (g_strcmp0 (gs_app_get_management_plugin (app),
gs_plugin_get_name (plugin)) != 0)
return TRUE;
/* remove the epi 'config' file */
gs_app_set_state (app, AS_APP_STATE_REMOVING);
epi_desktop = gs_app_get_source_id_default (app);
file_epi = g_file_new_for_path (epi_desktop);
if (!g_file_delete (file_epi, NULL, error))
return FALSE;
/* remove the shared desktop file */
app_desktop = g_build_filename (g_get_user_data_dir (),
"applications",
gs_app_get_id (app),
NULL);
file_app = g_file_new_for_path (app_desktop);
if (!g_file_delete (file_app, NULL, error)) {
gs_utils_error_convert_gio (error);
return FALSE;
}
gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
return TRUE;
}
gboolean
gs_plugin_refine_app (GsPlugin *plugin,
GsApp *app,
GsPluginRefineFlags flags,
GCancellable *cancellable,
GError **error)
{
const gchar *name;
g_autofree gchar *fn = NULL;
g_autofree gchar *hash = NULL;
g_autofree gchar *id_nonfull = NULL;
/* only process this app if was created by this plugin */
if (g_strcmp0 (gs_app_get_management_plugin (app),
gs_plugin_get_name (plugin)) != 0)
return TRUE;
gs_app_set_size_installed (app, 4096);
/* i guess this is technically true */
gs_app_add_kudo (app, GS_APP_KUDO_SANDBOXED_SECURE);
name = gs_app_get_name (app);
if (name == NULL) {
g_set_error (error,
GS_PLUGIN_ERROR,
GS_PLUGIN_ERROR_INVALID_FORMAT,
"name unset for %s",
gs_app_get_id (app));
return FALSE;
}
if (gs_app_get_summary (app) == NULL) {
g_debug ("faking summary for %s", gs_app_get_id (app));
gs_app_set_summary (app, GS_APP_QUALITY_LOWEST,
"Web Application");
}
hash = g_compute_checksum_for_string (G_CHECKSUM_SHA1, name, -1);
id_nonfull = _gs_app_get_id_nonfull (app);
fn = g_strdup_printf ("%s/epiphany/app-%s-%s/%s-%s.desktop",
g_get_user_config_dir (),
id_nonfull,
hash,
id_nonfull,
hash);
/* try the new-style location */
if (!g_file_test (fn, G_FILE_TEST_EXISTS)) {
g_free (fn);
fn = g_strdup_printf ("%s/epiphany/app-%s/%s.desktop",
g_get_user_config_dir (),
id_nonfull, id_nonfull);
}
if (g_file_test (fn, G_FILE_TEST_EXISTS)) {
gs_app_set_state (app, AS_APP_STATE_INSTALLED);
gs_app_add_source_id (app, fn);
gs_app_set_management_plugin (app, gs_plugin_get_name (plugin));
return TRUE;
}
gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
return TRUE;
}
gboolean
gs_plugin_launch (GsPlugin *plugin,
GsApp *app,
GCancellable *cancellable,
GError **error)
{
/* only process this app if was created by this plugin */
if (g_strcmp0 (gs_app_get_management_plugin (app),
gs_plugin_get_name (plugin)) != 0)
return TRUE;
return gs_plugin_app_launch (plugin, app, error);
}
plugins/epiphany/gs-self-test.c deleted 100644 → 0
View file @ 056450b0
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
*
* Copyright (C) 2013-2017 Richard Hughes <richard@hughsie.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include "config.h"
#include "gnome-software-private.h"
#include "gs-test.h"
static void
gs_plugins_epiphany_func (GsPluginLoader *plugin_loader)
{
gboolean ret;
g_autoptr(GError) error = NULL;
g_autoptr(GsApp) app = NULL;
g_autoptr(GsPluginJob) plugin_job = NULL;
/* no epiphany, abort */
if (!gs_plugin_loader_get_enabled (plugin_loader, "epiphany"))
return;
/* a webapp with a local icon */
app = gs_app_new ("arachne.desktop");
gs_app_set_kind (app, AS_APP_KIND_WEB_APP);
plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE,
"app", app,
"refine-flags", GS_PLUGIN_REFINE_FLAGS_REQUIRE_ICON,
NULL);
ret = gs_plugin_loader_job_action (plugin_loader, plugin_job, NULL, &error);
gs_test_flush_main_context ();
g_assert_no_error (error);
g_assert (ret);
g_assert_cmpint (gs_app_get_state (app), ==, AS_APP_STATE_AVAILABLE);
g_assert (gs_app_get_pixbuf (app) != NULL);
}
int
main (int argc, char **argv)
{
gboolean ret;
g_autofree gchar *fn = NULL;
g_autofree gchar *xml = NULL;
g_autoptr(GError) error = NULL;
g_autoptr(GsPluginLoader) plugin_loader = NULL;
const gchar *whitelist[] = {
"appstream",
"epiphany",
"icons",
NULL
};
g_test_init (&argc, &argv, NULL);
g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
g_setenv ("GS_XMLB_VERBOSE", "1", TRUE);
fn = gs_test_get_filename (TESTDATADIR, "icons/hicolor/scalable/org.gnome.Software.svg");
g_assert (fn != NULL);
xml = g_strdup_printf ("<?xml version=\"1.0\"?>\n"
"<components version=\"0.9\">\n"
" <component type=\"webapp\">\n"
" <id>arachne.desktop</id>\n"
" <name>test</name>\n"
" <pkgname>test</pkgname>\n"
" <icon type=\"remote\">file://%s</icon>\n"
" </component>\n"
" <info>\n"
" <scope>user</scope>\n"
" </info>\n"
"</components>\n", fn);
g_setenv ("GS_SELF_TEST_APPSTREAM_XML", xml, TRUE);
/* only critical and error are fatal */
g_log_set_fatal_mask (NULL, G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
/* we can only load this once per process */
plugin_loader = gs_plugin_loader_new ();
gs_plugin_loader_add_location (plugin_loader, LOCALPLUGINDIR);
gs_plugin_loader_add_location (plugin_loader, LOCALPLUGINDIR_CORE);
ret = gs_plugin_loader_setup (plugin_loader,
(gchar**) whitelist,
NULL,
NULL,
&error);
g_assert_no_error (error);
g_assert (ret);
/* plugin tests go here */
g_test_add_data_func ("/gnome-software/plugins/epiphany",
plugin_loader,
(GTestDataFunc) gs_plugins_epiphany_func);
return g_test_run ();
}
plugins/epiphany/meson.build deleted 100644 → 0
View file @ 056450b0
cargs = ['-DG_LOG_DOMAIN="GsPluginEpiphany"']
cargs += ['-DLOCALPLUGINDIR="' + meson.current_build_dir() + '"']
cargs += ['-DLOCALPLUGINDIR_CORE="' + meson.current_build_dir() + '/../core"']
shared_module(
'gs_plugin_epiphany',
sources : 'gs-plugin-epiphany.c',
include_directories : [
include_directories('../..'),
include_directories('../../lib'),
],
install : true,
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
link_with : [
libgnomesoftware
]
)
metainfo = 'org.gnome.Software.Plugin.Epiphany.metainfo.xml'
i18n.merge_file(
input: metainfo + '.in',
output: metainfo,
type: 'xml',
po_dir: join_paths(meson.source_root(), 'po'),
install: true,
install_dir: join_paths(get_option('datadir'), 'metainfo')
)
if get_option('tests')
cargs += ['-DTESTDATADIR="' + join_paths(meson.current_source_dir(), '..', '..', 'data') + '"']
e = executable(
'gs-self-test-epiphany',
compiled_schemas,
sources : [
'gs-self-test.c'
],
include_directories : [
include_directories('../..'),
include_directories('../../lib'),
],
dependencies : [
plugin_libs,
],
link_with : [
libgnomesoftware
],
c_args : cargs,
)
test('gs-self-test-epiphany', e, suite: ['plugins', 'epiphany'], env: test_env)
endif
plugins/epiphany/org.gnome.Software.Plugin.Epiphany.metainfo.xml.in deleted 100644 → 0
View file @ 056450b0
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2013-2016 Richard Hughes <richard@hughsie.com> -->
<component type="addon">
<id>org.gnome.Software.Plugin.Epiphany</id>
<extends>org.gnome.Software.desktop</extends>
<name>Web Apps Support</name>
<summary>Run popular web applications in a browser</summary>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<update_contact>richard_at_hughsie.com</update_contact>
</component>
plugins/meson.build
View file @ ea5eb222
......@@ -11,7 +11,6 @@ plugin_libs = [
subdir('core')
subdir('dpkg')
subdir('dummy')
subdir('epiphany')
subdir('fedora-langpacks')
subdir('fedora-pkgdb-collections')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment