[gnome-software/wip/jrocha/flatpak-user-and-system: 3/3] Refactor gs-plugin-flatpak-system.c to use the gs-flatpak module



commit de2698780027aeb80aff276eda5edb398820e396
Author: Joaquim Rocha <jrocha endlessm com>
Date:   Wed Jun 1 14:01:33 2016 +0200

    Refactor gs-plugin-flatpak-system.c to use the gs-flatpak module
    
    This deduplicates the code and makes both the flatpak-system and
    flatpak-user plugins very similar.

 src/plugins/gs-plugin-flatpak-system.c | 1272 +-------------------------------
 1 files changed, 31 insertions(+), 1241 deletions(-)
---
diff --git a/src/plugins/gs-plugin-flatpak-system.c b/src/plugins/gs-plugin-flatpak-system.c
index 43c94e8..f85dbc3 100644
--- a/src/plugins/gs-plugin-flatpak-system.c
+++ b/src/plugins/gs-plugin-flatpak-system.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2015 Richard Hughes <richard hughsie com>
+ * Copyright (C) 2016 Joaquim Rocha <jrocha endlessm com>
  *
  * Licensed under the GNU General Public License Version 2
  *
@@ -32,11 +32,7 @@
 #include <gnome-software.h>
 
 #include "gs-appstream.h"
-
-static gboolean                gs_plugin_refine_item_metadata (GsPlugin *plugin,
-                                                       GsApp *app,
-                                                       GCancellable *cancellable,
-                                                       GError **error);
+#include "gs-flatpak.h"
 
 struct GsPluginData {
        FlatpakInstallation     *installation;
@@ -63,314 +59,19 @@ gs_plugin_destroy (GsPlugin *plugin)
 void
 gs_plugin_adopt_app (GsPlugin *plugin, GsApp *app)
 {
-       if (g_str_has_prefix (gs_app_get_id (app), "flatpak:")) {
+       if (g_str_has_prefix (gs_app_get_id (app),
+                             GS_FLATPAK_SYSTEM_PREFIX ":")) {
                gs_app_set_management_plugin (app, gs_plugin_get_name (plugin));
        }
 }
 
-/* helpers */
-#define gs_app_get_flatpak_kind_as_str(app)    gs_app_get_metadata_item(app,"flatpak::kind")
-#define gs_app_get_flatpak_name(app)           gs_app_get_metadata_item(app,"flatpak::name")
-#define gs_app_get_flatpak_arch(app)           gs_app_get_metadata_item(app,"flatpak::arch")
-#define gs_app_get_flatpak_branch(app)         gs_app_get_metadata_item(app,"flatpak::branch")
-#define gs_app_get_flatpak_commit(app)         gs_app_get_metadata_item(app,"flatpak::commit")
-#define gs_app_set_flatpak_name(app,val)       gs_app_set_metadata(app,"flatpak::name",val)
-#define gs_app_set_flatpak_arch(app,val)       gs_app_set_metadata(app,"flatpak::arch",val)
-#define gs_app_set_flatpak_branch(app,val)     gs_app_set_metadata(app,"flatpak::branch",val)
-#define gs_app_set_flatpak_commit(app,val)     gs_app_set_metadata(app,"flatpak::commit",val)
-
-static FlatpakRefKind
-gs_app_get_flatpak_kind (GsApp *app)
-{
-       const gchar *kind = gs_app_get_metadata_item (app, "flatpak::kind");
-       if (g_strcmp0 (kind, "app") == 0)
-               return FLATPAK_REF_KIND_APP;
-       if (g_strcmp0 (kind, "runtime") == 0)
-               return FLATPAK_REF_KIND_RUNTIME;
-       g_warning ("unknown flatpak kind: %s", kind);
-       return FLATPAK_REF_KIND_APP;
-}
-
-static void
-gs_app_set_flatpak_kind (GsApp *app, FlatpakRefKind kind)
-{
-       if (kind == FLATPAK_REF_KIND_APP)
-               gs_app_set_metadata (app, "flatpak::kind", "app");
-       else if (kind == FLATPAK_REF_KIND_RUNTIME)
-               gs_app_set_metadata (app, "flatpak::kind", "runtime");
-       else
-               g_assert_not_reached ();
-}
-
-static void
-gs_plugin_flatpak_changed_cb (GFileMonitor *monitor,
-                             GFile *child,
-                             GFile *other_file,
-                             GFileMonitorEvent event_type,
-                             GsPlugin *plugin)
-{
-       gs_plugin_updates_changed (plugin);
-}
-
-static gboolean
-gs_plugin_refresh_appstream (GsPlugin *plugin,
-                            guint cache_age,
-                            GCancellable *cancellable,
-                            GError **error)
-{
-       GsPluginData *priv = gs_plugin_get_data (plugin);
-       gboolean ret;
-       guint i;
-       g_autoptr(GPtrArray) xremotes = NULL;
-
-       xremotes = flatpak_installation_list_remotes (priv->installation,
-                                                     cancellable,
-                                                     error);
-       if (xremotes == NULL)
-               return FALSE;
-       for (i = 0; i < xremotes->len; i++) {
-               guint tmp;
-               g_autoptr(GError) error_local = NULL;
-               g_autoptr(GFile) file = NULL;
-               g_autoptr(GFile) file_timestamp = NULL;
-               g_autofree gchar *appstream_fn = NULL;
-               FlatpakRemote *xremote = g_ptr_array_index (xremotes, i);
-
-               /* skip known-broken repos */
-               if (g_strcmp0 (flatpak_remote_get_name (xremote), "gnome-sdk") == 0)
-                       continue;
-               if (g_strcmp0 (flatpak_remote_get_name (xremote), "test-apps") == 0)
-                       continue;
-
-               /* is the timestamp new enough */
-               file_timestamp = flatpak_remote_get_appstream_timestamp (xremote, NULL);
-               tmp = gs_utils_get_file_age (file_timestamp);
-               if (tmp < cache_age) {
-                       g_autofree gchar *fn = g_file_get_path (file_timestamp);
-                       g_debug ("%s is only %i seconds old, so ignoring refresh",
-                                fn, tmp);
-                       continue;
-               }
-
-               /* download new data */
-               g_debug ("%s is %i seconds old, so downloading new data",
-                        flatpak_remote_get_name (xremote), tmp);
-               ret = flatpak_installation_update_appstream_sync (priv->installation,
-                                                                 flatpak_remote_get_name (xremote),
-                                                                 NULL, /* arch */
-                                                                 NULL, /* out_changed */
-                                                                 cancellable,
-                                                                 &error_local);
-               if (!ret) {
-                       if (g_error_matches (error_local,
-                                            G_IO_ERROR,
-                                            G_IO_ERROR_FAILED)) {
-                               g_debug ("Failed to get AppStream metadata: %s",
-                                        error_local->message);
-                               continue;
-                       }
-                       g_set_error (error,
-                                    GS_PLUGIN_ERROR,
-                                    GS_PLUGIN_ERROR_NOT_SUPPORTED,
-                                    "Failed to get AppStream metadata: %s",
-                                    error_local->message);
-                       return FALSE;
-               }
-
-               /* add the new AppStream repo to the shared store */
-               file = flatpak_remote_get_appstream_dir (xremote, NULL);
-               appstream_fn = g_file_get_path (file);
-               g_debug ("using AppStream metadata found at: %s", appstream_fn);
-       }
-       return TRUE;
-}
-
 gboolean
 gs_plugin_setup (GsPlugin *plugin, GCancellable *cancellable, GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       const gchar *destdir;
-       g_autoptr(AsProfileTask) ptask = NULL;
-
-       /* we use a permissions helper to elevate privs */
-       ptask = as_profile_start_literal (gs_plugin_get_profile (plugin),
-                                         "flatpak::ensure-origin");
-       destdir = g_getenv ("GS_SELF_TEST_FLATPACK_DATADIR");
-       if (destdir != NULL) {
-               g_autofree gchar *full_path = g_build_filename (destdir,
-                                                               "flatpak",
-                                                               NULL);
-               g_autoptr(GFile) file = g_file_new_for_path (full_path);
-               g_debug ("using custom flatpak path %s", full_path);
-               priv->installation = flatpak_installation_new_for_path (file,
-                                                                       TRUE,
-                                                                       cancellable,
-                                                                       error);
-       } else {
-               priv->installation = flatpak_installation_new_system (cancellable, error);
-       }
-       if (priv->installation == NULL)
-               return FALSE;
-
-       /* watch for changes */
-       priv->monitor =
-               flatpak_installation_create_monitor (priv->installation,
-                                                    cancellable,
-                                                    error);
-       if (priv->monitor == NULL)
-               return FALSE;
-       g_signal_connect (priv->monitor, "changed",
-                         G_CALLBACK (gs_plugin_flatpak_changed_cb), plugin);
-
-       /* success */
-       return TRUE;
-}
-
-static void
-gs_plugin_flatpak_set_metadata (GsApp *app, FlatpakRef *xref)
-{
-       gs_app_set_management_plugin (app, "flatpak");
-       gs_app_set_flatpak_kind (app, flatpak_ref_get_kind (xref));
-       gs_app_set_flatpak_name (app, flatpak_ref_get_name (xref));
-       gs_app_set_flatpak_arch (app, flatpak_ref_get_arch (xref));
-       gs_app_set_flatpak_branch (app, flatpak_ref_get_branch (xref));
-       gs_app_set_flatpak_commit (app, flatpak_ref_get_commit (xref));
-}
-
-static void
-gs_plugin_flatpak_set_metadata_installed (GsPlugin *plugin,
-                                         GsApp *app,
-                                         FlatpakInstalledRef *xref)
-{
-       guint64 mtime;
-       guint64 size_installed;
-       g_autofree gchar *metadata_fn = NULL;
-       g_autoptr(GFile) file = NULL;
-       g_autoptr(GFileInfo) info = NULL;
-
-       /* for all types */
-       gs_plugin_flatpak_set_metadata (app, FLATPAK_REF (xref));
-       gs_app_set_metadata (app, "GnomeSoftware::Creator",
-                            gs_plugin_get_name (plugin));
-
-       /* get the last time the app was updated */
-       metadata_fn = g_build_filename (flatpak_installed_ref_get_deploy_dir (xref),
-                                       "..",
-                                       "active",
-                                       NULL);
-       file = g_file_new_for_path (metadata_fn);
-       info = g_file_query_info (file,
-                                 G_FILE_ATTRIBUTE_TIME_MODIFIED,
-                                 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                 NULL, NULL);
-       if (info != NULL) {
-               mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-               gs_app_set_install_date (app, mtime);
-       }
-
-       /* this is faster than resolving */
-       gs_app_set_origin (app, flatpak_installed_ref_get_origin (xref));
-
-       /* this is faster than flatpak_installation_fetch_remote_size_sync() */
-       size_installed = flatpak_installed_ref_get_installed_size (xref);
-       if (size_installed != 0)
-               gs_app_set_size_installed (app, size_installed);
-}
-
-static gchar *
-gs_plugin_flatpak_build_id (FlatpakInstallation *installation, FlatpakRef *xref)
-{
-       const gchar *prefix = "flatpak";
-
-       /* use a different prefix if we're somehow running this as per-user */
-       if (flatpak_installation_get_is_user (installation))
-               prefix = "user:flatpak";
-
-       /* flatpak doesn't use a suffix; AppStream does */
-       if (flatpak_ref_get_kind (xref) == FLATPAK_REF_KIND_APP) {
-               return g_strdup_printf ("%s:%s.desktop",
-                                       prefix,
-                                       flatpak_ref_get_name (xref));
-       }
-       return g_strdup_printf ("%s:%s.runtime",
-                               prefix,
-                               flatpak_ref_get_name (xref));
-}
-
-static GsApp *
-gs_plugin_flatpak_create_installed (GsPlugin *plugin,
-                                   FlatpakInstalledRef *xref,
-                                   GError **error)
-{
-       GsPluginData *priv = gs_plugin_get_data (plugin);
-       g_autofree gchar *id = NULL;
-       g_autoptr(AsIcon) icon = NULL;
-       g_autoptr(GsApp) app = NULL;
-
-       g_return_val_if_fail (xref != NULL, NULL);
-
-       /*
-        * Only show the current application in GNOME Software
-        *
-        * You can have multiple versions/branches of a particular app-id
-        * installed but only one of them is "current" where this means:
-        *  1) the default to launch unless you specify a version
-        *  2) The one that gets its exported files exported
-        */
-       if (!flatpak_installed_ref_get_is_current (xref) &&
-           flatpak_ref_get_kind (FLATPAK_REF(xref)) == FLATPAK_REF_KIND_APP) {
-               g_set_error (error,
-                            GS_PLUGIN_ERROR,
-                            GS_PLUGIN_ERROR_NOT_SUPPORTED,
-                            "%s not current, ignoring",
-                            flatpak_ref_get_name (FLATPAK_REF (xref)));
-               return NULL;
-       }
-
-       /* create new object */
-       id = gs_plugin_flatpak_build_id (priv->installation, FLATPAK_REF (xref));
-       app = gs_plugin_cache_lookup (plugin, id);
-       if (app == NULL) {
-               app = gs_app_new (id);
-               gs_plugin_cache_add (plugin, id, app);
-       }
-       gs_plugin_flatpak_set_metadata_installed (plugin, app, xref);
-
-       switch (flatpak_ref_get_kind (FLATPAK_REF(xref))) {
-       case FLATPAK_REF_KIND_APP:
-               gs_app_set_kind (app, AS_APP_KIND_DESKTOP);
-               break;
-       case FLATPAK_REF_KIND_RUNTIME:
-               gs_app_set_flatpak_kind (app, FLATPAK_REF_KIND_RUNTIME);
-               gs_app_set_kind (app, AS_APP_KIND_RUNTIME);
-               gs_app_set_name (app, GS_APP_QUALITY_NORMAL,
-                                flatpak_ref_get_name (FLATPAK_REF (xref)));
-               gs_app_set_summary (app, GS_APP_QUALITY_NORMAL,
-                                   "Framework for applications");
-               gs_app_set_version (app, flatpak_ref_get_branch (FLATPAK_REF (xref)));
-               icon = as_icon_new ();
-               as_icon_set_kind (icon, AS_ICON_KIND_STOCK);
-               as_icon_set_name (icon, "system-run-symbolic");
-               gs_app_add_icon (app, icon);
-               break;
-       default:
-               g_set_error_literal (error,
-                                    GS_PLUGIN_ERROR,
-                                    GS_PLUGIN_ERROR_NOT_SUPPORTED,
-                                    "FlatpakRefKind not known");
-               return NULL;
-       }
-       return g_object_ref (app);
-}
-
-static void
-gs_plugin_flatpak_progress_cb (const gchar *status,
-                              guint progress,
-                              gboolean estimating,
-                              gpointer user_data)
-{
-       GsApp *app = GS_APP (user_data);
-       gs_app_set_progress (app, progress);
+       return gs_flatpak_setup (plugin, GS_FLATPAK_TYPE_SYSTEM,
+                                &priv->installation, &priv->monitor,
+                                cancellable, error);
 }
 
 gboolean
@@ -380,43 +81,8 @@ gs_plugin_add_installed (GsPlugin *plugin,
                         GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       g_autoptr(GError) error_md = NULL;
-       g_autoptr(GPtrArray) xrefs = NULL;
-       guint i;
-
-       /* if we've never ever run before, get the AppStream data */
-       if (!gs_plugin_refresh_appstream (plugin,
-                                         G_MAXUINT,
-                                         cancellable,
-                                         &error_md)) {
-               g_warning ("failed to get initial available data: %s",
-                          error_md->message);
-       }
-
-       /* get apps and runtimes */
-       xrefs = flatpak_installation_list_installed_refs (priv->installation,
-                                                         cancellable, error);
-       if (xrefs == NULL)
-               return FALSE;
-       for (i = 0; i < xrefs->len; i++) {
-               FlatpakInstalledRef *xref = g_ptr_array_index (xrefs, i);
-               g_autoptr(GError) error_local = NULL;
-               g_autoptr(GsApp) app = NULL;
-
-               /* only apps */
-               if (flatpak_ref_get_kind (FLATPAK_REF (xref)) != FLATPAK_REF_KIND_APP)
-                       continue;
-
-               app = gs_plugin_flatpak_create_installed (plugin, xref, &error_local);
-               if (app == NULL) {
-                       g_warning ("failed to add flatpak: %s", error_local->message);
-                       continue;
-               }
-               gs_app_set_state (app, AS_APP_STATE_INSTALLED);
-               gs_app_list_add (list, app);
-       }
-
-       return TRUE;
+       return gs_flatpak_add_installed (plugin, priv->installation, list,
+                                        cancellable, error);
 }
 
 gboolean
@@ -426,39 +92,8 @@ gs_plugin_add_sources (GsPlugin *plugin,
                       GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       g_autoptr(GPtrArray) xremotes = NULL;
-       guint i;
-
-       xremotes = flatpak_installation_list_remotes (priv->installation,
-                                                     cancellable,
-                                                     error);
-       if (xremotes == NULL)
-               return FALSE;
-       for (i = 0; i < xremotes->len; i++) {
-               FlatpakRemote *xremote = g_ptr_array_index (xremotes, i);
-               g_autoptr(GsApp) app = NULL;
-
-               /* apps installed from bundles add their own remote that only
-                * can be used for updating that app only -- so hide them */
-               if (flatpak_remote_get_noenumerate (xremote))
-                       continue;
-
-               app = gs_app_new (flatpak_remote_get_name (xremote));
-               gs_app_set_management_plugin (app, gs_plugin_get_name (plugin));
-               gs_app_set_kind (app, AS_APP_KIND_SOURCE);
-               gs_app_set_state (app, AS_APP_STATE_INSTALLED);
-               gs_app_set_name (app,
-                                GS_APP_QUALITY_LOWEST,
-                                flatpak_remote_get_name (xremote));
-               gs_app_set_summary (app,
-                                   GS_APP_QUALITY_LOWEST,
-                                   flatpak_remote_get_title (xremote));
-               gs_app_set_url (app,
-                               AS_URL_KIND_HOMEPAGE,
-                               flatpak_remote_get_url (xremote));
-               gs_app_list_add (list, app);
-       }
-       return TRUE;
+       return gs_flatpak_add_sources (plugin, priv->installation, list,
+                                      cancellable, error);
 }
 
 gboolean
@@ -468,33 +103,8 @@ gs_plugin_add_source (GsPlugin *plugin,
                      GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       g_autoptr(FlatpakRemote) xremote = NULL;
-
-       /* only process this source if was created for this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app),
-                      gs_plugin_get_name (plugin)) != 0)
-               return TRUE;
-
-       /* create a new remote */
-       xremote = flatpak_remote_new (gs_app_get_id (app));
-       flatpak_remote_set_gpg_verify (xremote, FALSE); // FIXME
-       flatpak_remote_set_url (xremote, gs_app_get_url (app, AS_URL_KIND_HOMEPAGE));
-       if (gs_app_get_summary (app) != NULL)
-               flatpak_remote_set_title (xremote, gs_app_get_summary (app));
-
-       /* install it */
-       gs_app_set_state (app, AS_APP_STATE_INSTALLING);
-       if (!flatpak_installation_modify_remote (priv->installation,
-                                                xremote,
-                                                cancellable,
-                                                error)) {
-               gs_app_set_state_recover (app);
-               return FALSE;
-       }
-
-       /* success */
-       gs_app_set_state (app, AS_APP_STATE_INSTALLED);
-       return TRUE;
+       return gs_flatpak_add_source (plugin, priv->installation, app,
+                                     cancellable, error);
 }
 
 gboolean
@@ -504,54 +114,8 @@ gs_plugin_add_updates (GsPlugin *plugin,
                       GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       guint i;
-       g_autoptr(GPtrArray) xrefs = NULL;
-
-       /* manually drop the cache */
-       if (0&&!flatpak_installation_drop_caches (priv->installation,
-                                              cancellable,
-                                              error)) {
-               return FALSE;
-       }
-
-       /* get all the installed apps (no network I/O) */
-       xrefs = flatpak_installation_list_installed_refs (priv->installation,
-                                                         cancellable,
-                                                         error);
-       if (xrefs == NULL)
-               return FALSE;
-       for (i = 0; i < xrefs->len; i++) {
-               FlatpakInstalledRef *xref = g_ptr_array_index (xrefs, i);
-               const gchar *commit;
-               const gchar *latest_commit;
-               g_autoptr(GsApp) app = NULL;
-               g_autoptr(GError) error_local = NULL;
-
-               /* check the application has already been downloaded */
-               commit = flatpak_ref_get_commit (FLATPAK_REF (xref));
-               latest_commit = flatpak_installed_ref_get_latest_commit (xref);
-               if (g_strcmp0 (commit, latest_commit) == 0) {
-                       g_debug ("no downloaded update for %s",
-                                flatpak_ref_get_name (FLATPAK_REF (xref)));
-                       continue;
-               }
-
-               /* we have an update to show */
-               g_debug ("%s has a downloaded update %s->%s",
-                        flatpak_ref_get_name (FLATPAK_REF (xref)),
-                        commit, latest_commit);
-               app = gs_plugin_flatpak_create_installed (plugin, xref, &error_local);
-               if (app == NULL) {
-                       g_warning ("failed to add flatpak: %s", error_local->message);
-                       continue;
-               }
-               if (gs_app_get_state (app) == AS_APP_STATE_INSTALLED)
-                       gs_app_set_state (app, AS_APP_STATE_UNKNOWN);
-               gs_app_set_state (app, AS_APP_STATE_UPDATABLE_LIVE);
-               gs_app_list_add (list, app);
-       }
-
-       return TRUE;
+       return gs_flatpak_add_updates (plugin, priv->installation, list,
+                                      cancellable, error);
 }
 
 gboolean
@@ -562,517 +126,8 @@ gs_plugin_refresh (GsPlugin *plugin,
                   GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       guint i;
-       g_autoptr(GPtrArray) xrefs = NULL;
-
-       /* update AppStream metadata */
-       if (flags & GS_PLUGIN_REFRESH_FLAGS_METADATA) {
-               if (!gs_plugin_refresh_appstream (plugin, cache_age,
-                                                 cancellable, error))
-                       return FALSE;
-       }
-
-       /* no longer interesting */
-       if ((flags & GS_PLUGIN_REFRESH_FLAGS_PAYLOAD) == 0)
-               return TRUE;
-
-       /* get all the updates available from all remotes */
-       xrefs = flatpak_installation_list_installed_refs_for_update (priv->installation,
-                                                                    cancellable,
-                                                                    error);
-       if (xrefs == NULL)
-               return FALSE;
-       for (i = 0; i < xrefs->len; i++) {
-               FlatpakInstalledRef *xref = g_ptr_array_index (xrefs, i);
-               g_autoptr(GsApp) app = NULL;
-               g_autoptr(FlatpakInstalledRef) xref2 = NULL;
-
-               /* try to create a GsApp so we can do progress reporting */
-               app = gs_plugin_flatpak_create_installed (plugin, xref, NULL);
-
-               /* fetch but do not deploy */
-               g_debug ("pulling update for %s",
-                        flatpak_ref_get_name (FLATPAK_REF (xref)));
-               xref2 = flatpak_installation_update (priv->installation,
-                                                    FLATPAK_UPDATE_FLAGS_NO_DEPLOY,
-                                                    flatpak_ref_get_kind (FLATPAK_REF (xref)),
-                                                    flatpak_ref_get_name (FLATPAK_REF (xref)),
-                                                    flatpak_ref_get_arch (FLATPAK_REF (xref)),
-                                                    flatpak_ref_get_branch (FLATPAK_REF (xref)),
-                                                    gs_plugin_flatpak_progress_cb, app,
-                                                    cancellable, error);
-               if (xref2 == NULL)
-                       return FALSE;
-       }
-
-       return TRUE;
-}
-
-static gboolean
-gs_plugin_refine_item_origin_ui (GsPlugin *plugin,
-                                GsApp *app,
-                                GCancellable *cancellable,
-                                GError **error)
-{
-       GsPluginData *priv = gs_plugin_get_data (plugin);
-       const gchar *origin;
-       guint i;
-       g_autoptr(GPtrArray) xremotes = NULL;
-       g_autoptr(AsProfileTask) ptask = NULL;
-
-       /* already set */
-       origin = gs_app_get_origin_ui (app);
-       if (origin != NULL)
-               return TRUE;
-
-       /* find list of remotes */
-       ptask = as_profile_start_literal (gs_plugin_get_profile (plugin),
-                                         "flatpak::refine-origin-ui");
-       xremotes = flatpak_installation_list_remotes (priv->installation,
-                                                     cancellable,
-                                                     error);
-       if (xremotes == NULL)
-               return FALSE;
-       for (i = 0; i < xremotes->len; i++) {
-               FlatpakRemote *xremote = g_ptr_array_index (xremotes, i);
-               if (g_strcmp0 (gs_app_get_origin (app),
-                              flatpak_remote_get_name (xremote)) == 0) {
-                       gs_app_set_origin_ui (app, flatpak_remote_get_title (xremote));
-                       break;
-               }
-       }
-
-       return TRUE;
-}
-
-static gboolean
-gs_plugin_refine_item_origin (GsPlugin *plugin,
-                             GsApp *app,
-                             GCancellable *cancellable,
-                             GError **error)
-{
-       GsPluginData *priv = gs_plugin_get_data (plugin);
-       guint i;
-       g_autoptr(GPtrArray) xremotes = NULL;
-       g_autoptr(AsProfileTask) ptask = NULL;
-
-       /* already set */
-       if (gs_app_get_origin (app) != NULL)
-               return TRUE;
-
-       /* ensure metadata exists */
-       ptask = as_profile_start_literal (gs_plugin_get_profile (plugin),
-                                         "flatpak::refine-origin");
-       if (!gs_plugin_refine_item_metadata (plugin, app, cancellable, error))
-               return FALSE;
-
-       /* find list of remotes */
-       g_debug ("looking for a remote for %s/%s/%s",
-                gs_app_get_flatpak_name (app),
-                gs_app_get_flatpak_arch (app),
-                gs_app_get_flatpak_branch (app));
-       xremotes = flatpak_installation_list_remotes (priv->installation,
-                                                     cancellable,
-                                                     error);
-       if (xremotes == NULL)
-               return FALSE;
-       for (i = 0; i < xremotes->len; i++) {
-               const gchar *remote_name;
-               FlatpakRemote *xremote = g_ptr_array_index (xremotes, i);
-               g_autoptr(FlatpakRemoteRef) xref = NULL;
-               remote_name = flatpak_remote_get_name (xremote);
-               g_debug ("looking at remote %s", remote_name);
-               xref = flatpak_installation_fetch_remote_ref_sync (priv->installation,
-                                                                  remote_name,
-                                                                  gs_app_get_flatpak_kind (app),
-                                                                  gs_app_get_flatpak_name (app),
-                                                                  gs_app_get_flatpak_arch (app),
-                                                                  gs_app_get_flatpak_branch (app),
-                                                                  cancellable,
-                                                                  NULL);
-               if (xref != NULL) {
-                       g_debug ("found remote %s", remote_name);
-                       gs_app_set_origin (app, remote_name);
-                       return TRUE;
-               }
-       }
-       g_set_error (error,
-                    GS_PLUGIN_ERROR,
-                    GS_PLUGIN_ERROR_NOT_SUPPORTED,
-                    "Not found %s/%s/%s",
-                    gs_app_get_flatpak_name (app),
-                    gs_app_get_flatpak_arch (app),
-                    gs_app_get_flatpak_branch (app));
-       return FALSE;
-}
-
-static gboolean
-gs_plugin_flatpak_app_matches_xref (GsPlugin *plugin, GsApp *app, FlatpakRef *xref)
-{
-       GsPluginData *priv = gs_plugin_get_data (plugin);
-       g_autofree gchar *id = NULL;
-
-       /* check ID */
-       id = gs_plugin_flatpak_build_id (priv->installation, xref);
-       if (g_strcmp0 (id, gs_app_get_id (app)) == 0)
-               return TRUE;
-
-       /* do all the metadata items match? */
-       if (g_strcmp0 (gs_app_get_flatpak_name (app),
-                      flatpak_ref_get_name (xref)) == 0 &&
-           g_strcmp0 (gs_app_get_flatpak_arch (app),
-                      flatpak_ref_get_arch (xref)) == 0 &&
-           g_strcmp0 (gs_app_get_flatpak_branch (app),
-                      flatpak_ref_get_branch (xref)) == 0)
-               return TRUE;
-
-       /* sad panda */
-       return FALSE;
-}
-
-static FlatpakRef *
-gs_plugin_flatpak_create_fake_ref (GsApp *app, GError **error)
-{
-       g_autofree gchar *id = NULL;
-       id = g_strdup_printf ("%s/%s/%s/%s",
-                             gs_app_get_flatpak_kind_as_str (app),
-                             gs_app_get_flatpak_name (app),
-                             gs_app_get_flatpak_arch (app),
-                             gs_app_get_flatpak_branch (app));
-       return flatpak_ref_parse (id, error);
-}
-
-static gboolean
-gs_plugin_refine_item_metadata (GsPlugin *plugin,
-                               GsApp *app,
-                               GCancellable *cancellable,
-                               GError **error)
-{
-       g_autoptr(FlatpakRef) xref = NULL;
-
-       /* already set */
-       if (gs_app_get_metadata_item (app, "flatpak::kind") != NULL)
-               return TRUE;
-
-       /* not a valid type */
-       if (gs_app_get_kind (app) == AS_APP_KIND_SOURCE)
-               return TRUE;
-
-       /* AppStream sets the source to appname/arch/branch, if this isn't set
-        * we can't break out the fields */
-       if (gs_app_get_source_default (app) == NULL) {
-               g_autofree gchar *tmp = gs_app_to_string (app);
-               g_warning ("no source set by appstream for %s: %s",
-                          gs_plugin_get_name (plugin), tmp);
-               return TRUE;
-       }
-
-       /* parse the ref */
-       xref = flatpak_ref_parse (gs_app_get_source_default (app), error);
-       if (xref == NULL) {
-               g_prefix_error (error, "failed to parse '%s': ",
-                               gs_app_get_source_default (app));
-               return FALSE;
-       }
-       gs_plugin_flatpak_set_metadata (app, xref);
-
-       /* success */
-       return TRUE;
-}
-
-static gboolean
-gs_plugin_refine_item_state (GsPlugin *plugin,
-                             GsApp *app,
-                             GCancellable *cancellable,
-                             GError **error)
-{
-       GsPluginData *priv = gs_plugin_get_data (plugin);
-       guint i;
-       g_autoptr(GPtrArray) xrefs = NULL;
-       g_autoptr(AsProfileTask) ptask = NULL;
-
-       /* already found */
-       if (gs_app_get_state (app) != AS_APP_STATE_UNKNOWN)
-               return TRUE;
-
-       /* need broken out metadata */
-       if (!gs_plugin_refine_item_metadata (plugin, app, cancellable, error))
-               return FALSE;
-
-       /* get apps and runtimes */
-       ptask = as_profile_start_literal (gs_plugin_get_profile (plugin),
-                                         "flatpak::refine-action");
-       xrefs = flatpak_installation_list_installed_refs (priv->installation,
-                                                         cancellable, error);
-       if (xrefs == NULL)
-               return FALSE;
-       for (i = 0; i < xrefs->len; i++) {
-               FlatpakInstalledRef *xref = g_ptr_array_index (xrefs, i);
-
-               /* check xref is app */
-               if (!gs_plugin_flatpak_app_matches_xref (plugin, app, FLATPAK_REF(xref)))
-                       continue;
-
-               /* mark as installed */
-               g_debug ("marking %s as installed with flatpak",
-                        gs_app_get_id (app));
-               gs_plugin_flatpak_set_metadata_installed (plugin, app, xref);
-               if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN)
-                       gs_app_set_state (app, AS_APP_STATE_INSTALLED);
-       }
-
-       /* ensure origin set */
-       if (!gs_plugin_refine_item_origin (plugin, app, cancellable, error))
-               return FALSE;
-
-       /* anything not installed just check the remote is still present */
-       if (gs_app_get_state (app) == AS_APP_STATE_UNKNOWN &&
-           gs_app_get_origin (app) != NULL) {
-               g_autoptr(FlatpakRemote) xremote = NULL;
-               xremote = flatpak_installation_get_remote_by_name (priv->installation,
-                                                                  gs_app_get_origin (app),
-                                                                  cancellable, NULL);
-               if (xremote != NULL) {
-                       g_debug ("marking %s as available with flatpak",
-                                gs_app_get_id (app));
-                       gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
-               } else {
-                       g_warning ("failed to find flatpak remote %s for %s",
-                                  gs_app_get_origin (app),
-                                  gs_app_get_id (app));
-               }
-       }
-
-       /* success */
-       return TRUE;
-}
-
-static gboolean
-gs_plugin_flatpak_set_app_metadata (GsPlugin *plugin,
-                                   GsApp *app,
-                                   const gchar *data,
-                                   gsize length,
-                                   GError **error)
-{
-       g_autofree gchar *name = NULL;
-       g_autofree gchar *runtime = NULL;
-       g_autofree gchar *source = NULL;
-       g_autoptr(GKeyFile) kf = NULL;
-       g_autoptr(GsApp) app_runtime = NULL;
-
-       kf = g_key_file_new ();
-       if (!g_key_file_load_from_data (kf, data, length, G_KEY_FILE_NONE, error))
-               return FALSE;
-       name = g_key_file_get_string (kf, "Application", "name", error);
-       if (name == NULL)
-               return FALSE;
-       gs_app_set_flatpak_name (app, name);
-       runtime = g_key_file_get_string (kf, "Application", "runtime", error);
-       if (runtime == NULL)
-               return FALSE;
-       g_debug ("runtime for %s is %s", name, runtime);
-
-       /* create runtime */
-       app_runtime = gs_appstream_create_runtime (plugin, app, runtime);
-       if (app_runtime != NULL)
-               gs_app_set_runtime (app, app_runtime);
-
-       return TRUE;
-}
-
-static gboolean
-gs_plugin_refine_item_runtime (GsPlugin *plugin,
-                              GsApp *app,
-                              GCancellable *cancellable,
-                              GError **error)
-{
-       GsPluginData *priv = gs_plugin_get_data (plugin);
-       const gchar *str;
-       gsize len = -1;
-       g_autofree gchar *contents = NULL;
-       g_autofree gchar *installation_path_str = NULL;
-       g_autofree gchar *install_path = NULL;
-       g_autoptr(GBytes) data = NULL;
-       g_autoptr(GFile) installation_path = NULL;
-
-       /* not applicable */
-       if (gs_app_get_flatpak_kind (app) != FLATPAK_REF_KIND_APP)
-               return TRUE;
-
-       /* already exists */
-       if (gs_app_get_runtime (app) != NULL)
-               return TRUE;
-
-       /* this is quicker than doing network IO */
-       installation_path = flatpak_installation_get_path (priv->installation);
-       installation_path_str = g_file_get_path (installation_path);
-       install_path = g_build_filename (installation_path_str,
-                                        gs_app_get_flatpak_kind_as_str (app),
-                                        gs_app_get_flatpak_name (app),
-                                        gs_app_get_flatpak_arch (app),
-                                        gs_app_get_flatpak_branch (app),
-                                        "active",
-                                        "metadata",
-                                        NULL);
-       if (g_file_test (install_path, G_FILE_TEST_EXISTS)) {
-               if (!g_file_get_contents (install_path, &contents, &len, error))
-                       return FALSE;
-               str = contents;
-       } else {
-               g_autoptr(FlatpakRef) xref = NULL;
-
-               /* fetch from the server */
-               xref = gs_plugin_flatpak_create_fake_ref (app, error);
-               if (xref == NULL)
-                       return FALSE;
-               data = flatpak_installation_fetch_remote_metadata_sync (priv->installation,
-                                                                       gs_app_get_origin (app),
-                                                                       xref,
-                                                                       cancellable,
-                                                                       error);
-               if (data == NULL)
-                       return FALSE;
-               str = g_bytes_get_data (data, &len);
-       }
-
-       /* parse key file */
-       if (!gs_plugin_flatpak_set_app_metadata (plugin, app, str, len, error))
-               return FALSE;
-       return TRUE;
-}
-
-static gboolean
-gs_plugin_refine_item_size (GsPlugin *plugin,
-                           GsApp *app,
-                           GCancellable *cancellable,
-                           GError **error)
-{
-       GsPluginData *priv = gs_plugin_get_data (plugin);
-       gboolean ret;
-       guint64 download_size;
-       guint64 installed_size;
-       g_autoptr(AsProfileTask) ptask = NULL;
-       g_autoptr(FlatpakRef) xref = NULL;
-       g_autoptr(GError) error_local = NULL;
-
-       /* already set */
-       if (gs_app_get_size_installed (app) > 0 &&
-           gs_app_get_size_download (app) > 0)
-               return TRUE;
-
-       /* need runtime */
-       if (!gs_plugin_refine_item_runtime (plugin, app, cancellable, error))
-               return FALSE;
-
-       /* calculate the platform size too if the app is not installed */
-       if (gs_app_get_state (app) == AS_APP_STATE_AVAILABLE &&
-           gs_app_get_flatpak_kind (app) == FLATPAK_REF_KIND_APP) {
-               GsApp *app_runtime;
-
-               /* find out what runtime the application depends on */
-               if (!gs_plugin_refine_item_runtime (plugin,
-                                                   app,
-                                                   cancellable,
-                                                   error))
-                       return FALSE;
-
-               /* is the app_runtime already installed? */
-               app_runtime = gs_app_get_runtime (app);
-               if (!gs_plugin_refine_item_state (plugin,
-                                                 app_runtime,
-                                                 cancellable,
-                                                 error))
-                       return FALSE;
-               if (gs_app_get_state (app_runtime) == AS_APP_STATE_INSTALLED) {
-                       g_debug ("runtime %s is already installed, so not adding size",
-                                gs_app_get_id (app_runtime));
-               } else {
-                       if (!gs_plugin_refine_item_size (plugin,
-                                                        app_runtime,
-                                                        cancellable,
-                                                        error))
-                               return FALSE;
-               }
-       }
-
-       /* just get the size of the app */
-       ptask = as_profile_start_literal (gs_plugin_get_profile (plugin),
-                                         "flatpak::refine-size");
-       if (!gs_plugin_refine_item_origin (plugin, app, cancellable, error))
-               return FALSE;
-       xref = gs_plugin_flatpak_create_fake_ref (app, error);
-       if (xref == NULL)
-               return FALSE;
-       ret = flatpak_installation_fetch_remote_size_sync (priv->installation,
-                                                          gs_app_get_origin (app),
-                                                          xref,
-                                                          &download_size,
-                                                          &installed_size,
-                                                          cancellable, &error_local);
-       if (!ret) {
-               g_warning ("libflatpak failed to return application size: %s",
-                          error_local->message);
-               gs_app_set_size_installed (app, GS_APP_SIZE_UNKNOWABLE);
-               gs_app_set_size_download (app, GS_APP_SIZE_UNKNOWABLE);
-       } else {
-               gs_app_set_size_installed (app, installed_size);
-               gs_app_set_size_download (app, download_size);
-       }
-       return TRUE;
-}
-
-static gboolean
-gs_plugin_flatpak_refine_app (GsPlugin *plugin,
-                             GsApp *app,
-                             GsPluginRefineFlags flags,
-                             GCancellable *cancellable,
-                             GError **error)
-{
-       g_autoptr(AsProfileTask) ptask = 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;
-
-       /* profile */
-       ptask = as_profile_start (gs_plugin_get_profile (plugin),
-                                 "flatpak::refine{%s}",
-                                 gs_app_get_id (app));
-
-       /* flatpak apps can always be removed */
-       gs_app_remove_quirk (app, AS_APP_QUIRK_COMPULSORY);
-
-       /* AppStream sets the source to appname/arch/branch */
-       if (!gs_plugin_refine_item_metadata (plugin, app, cancellable, error))
-               return FALSE;
-
-       /* check the installed state */
-       if (!gs_plugin_refine_item_state (plugin, app, cancellable, error))
-               return FALSE;
-
-       /* version fallback */
-       if (flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_VERSION) {
-               if (gs_app_get_version (app) == NULL) {
-                       const gchar *branch;
-                       branch = gs_app_get_flatpak_branch (app);
-                       gs_app_set_version (app, branch);
-               }
-       }
-
-       /* size */
-       if (flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SIZE) {
-               if (!gs_plugin_refine_item_size (plugin, app, cancellable, error))
-                       return FALSE;
-       }
-
-       /* origin */
-       if (flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN) {
-               if (!gs_plugin_refine_item_origin_ui (plugin, app, cancellable, error))
-                       return FALSE;
-       }
-
-       return TRUE;
+       return gs_flatpak_refresh (plugin, priv->installation, cache_age, flags,
+                                  cancellable, error);
 }
 
 gboolean
@@ -1081,7 +136,10 @@ gs_plugin_refine_app (GsPlugin *plugin,
                      GsPluginRefineFlags flags,
                      GCancellable *cancellable,
                      GError **error)
-{      return gs_plugin_flatpak_refine_app (plugin, app, flags, cancellable, error);
+{
+       GsPluginData *priv = gs_plugin_get_data (plugin);
+       return gs_flatpak_refine_app (plugin, priv->installation, app, flags,
+                                     cancellable, error);
 }
 
 gboolean
@@ -1091,23 +149,8 @@ gs_plugin_launch (GsPlugin *plugin,
                  GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       const gchar *branch = 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;
-
-       branch = gs_app_get_flatpak_branch (app);
-       if (branch == NULL)
-               branch = "master";
-       return flatpak_installation_launch (priv->installation,
-                                           gs_app_get_flatpak_name (app),
-                                           NULL,
-                                           branch,
-                                           NULL,
-                                           cancellable,
-                                           error);
+       return gs_flatpak_launch (plugin, priv->installation, app, cancellable,
+                                 error);
 }
 
 gboolean
@@ -1117,40 +160,8 @@ gs_plugin_app_remove (GsPlugin *plugin,
                      GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-
-       /* 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;
-
-       /* refine to get basics */
-       if (!gs_plugin_flatpak_refine_app (plugin, app,
-                                          GS_PLUGIN_REFINE_FLAGS_DEFAULT,
-                                          cancellable, error))
-               return FALSE;
-
-       /* remove */
-       gs_app_set_state (app, AS_APP_STATE_REMOVING);
-       if (!flatpak_installation_uninstall (priv->installation,
-                                            FLATPAK_REF_KIND_APP,
-                                            gs_app_get_flatpak_name (app),
-                                            gs_app_get_flatpak_arch (app),
-                                            gs_app_get_flatpak_branch (app),
-                                            gs_plugin_flatpak_progress_cb, app,
-                                            cancellable, error)) {
-               gs_app_set_state_recover (app);
-               return FALSE;
-       }
-
-       /* state is not known: we don't know if we can re-install this app */
-       gs_app_set_state (app, AS_APP_STATE_UNKNOWN);
-
-       /* refresh the state */
-       if (!gs_plugin_refine_item_state (plugin, app, cancellable, error))
-               return FALSE;
-
-       /* success */
-       return TRUE;
+       return gs_flatpak_app_remove (plugin, priv->installation, app,
+                                     cancellable, error);
 }
 
 gboolean
@@ -1160,91 +171,8 @@ gs_plugin_app_install (GsPlugin *plugin,
                       GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       g_autoptr(FlatpakInstalledRef) xref = 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;
-
-       /* ensure we have metadata and state */
-       if (!gs_plugin_flatpak_refine_app (plugin, app, 0, cancellable, error))
-               return FALSE;
-
-       /* install */
-       gs_app_set_state (app, AS_APP_STATE_INSTALLING);
-
-       /* install required runtime if not already installed */
-       if (gs_app_get_kind (app) == AS_APP_KIND_DESKTOP) {
-               GsApp *runtime;
-               runtime = gs_app_get_runtime (app);
-
-               /* the runtime could come from a different remote to the app */
-               if (!gs_plugin_refine_item_metadata (plugin, runtime, cancellable, error))
-                       return FALSE;
-               if (!gs_plugin_refine_item_origin (plugin, runtime, cancellable, error))
-                       return FALSE;
-               if (!gs_plugin_refine_item_state (plugin, runtime, cancellable, error))
-                       return FALSE;
-               if (gs_app_get_state (runtime) == AS_APP_STATE_UNKNOWN) {
-                       g_set_error (error,
-                                    GS_PLUGIN_ERROR,
-                                    GS_PLUGIN_ERROR_NOT_SUPPORTED,
-                                    "Failed to find runtime %s",
-                                    gs_app_get_source_default (runtime));
-                       return FALSE;
-               }
-
-               /* not installed */
-               if (gs_app_get_state (runtime) == AS_APP_STATE_AVAILABLE) {
-                       g_debug ("%s is not already installed, so installing",
-                                gs_app_get_id (runtime));
-                       gs_app_set_state (runtime, AS_APP_STATE_INSTALLING);
-                       xref = flatpak_installation_install (priv->installation,
-                                                            gs_app_get_origin (runtime),
-                                                            gs_app_get_flatpak_kind (runtime),
-                                                            gs_app_get_flatpak_name (runtime),
-                                                            gs_app_get_flatpak_arch (runtime),
-                                                            gs_app_get_flatpak_branch (runtime),
-                                                            gs_plugin_flatpak_progress_cb, app,
-                                                            cancellable, error);
-                       if (xref == NULL) {
-                               gs_app_set_state_recover (runtime);
-                               return FALSE;
-                       }
-                       gs_app_set_state (runtime, AS_APP_STATE_INSTALLED);
-               } else {
-                       g_debug ("%s is already installed, so skipping",
-                                gs_app_get_id (runtime));
-               }
-       }
-
-       /* use the source for local apps */
-       if (gs_app_get_state (app) == AS_APP_STATE_AVAILABLE_LOCAL) {
-               xref = flatpak_installation_install_bundle (priv->installation,
-                                                           gs_app_get_local_file (app),
-                                                           gs_plugin_flatpak_progress_cb,
-                                                           app,
-                                                           cancellable, error);
-       } else {
-               g_debug ("installing %s", gs_app_get_id (app));
-               xref = flatpak_installation_install (priv->installation,
-                                                    gs_app_get_origin (app),
-                                                    gs_app_get_flatpak_kind (app),
-                                                    gs_app_get_flatpak_name (app),
-                                                    gs_app_get_flatpak_arch (app),
-                                                    gs_app_get_flatpak_branch (app),
-                                                    gs_plugin_flatpak_progress_cb, app,
-                                                    cancellable, error);
-       }
-       if (xref == NULL) {
-               gs_app_set_state_recover (app);
-               return FALSE;
-       }
-
-       /* state is known */
-       gs_app_set_state (app, AS_APP_STATE_INSTALLED);
-       return TRUE;
+       return gs_flatpak_app_install (plugin, priv->installation, app,
+                                      cancellable, error);
 }
 
 gboolean
@@ -1254,31 +182,8 @@ gs_plugin_update_app (GsPlugin *plugin,
                      GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       g_autoptr(FlatpakInstalledRef) xref = 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;
-
-       /* install */
-       gs_app_set_state (app, AS_APP_STATE_INSTALLING);
-       xref = flatpak_installation_update (priv->installation,
-                                           FLATPAK_UPDATE_FLAGS_NONE,
-                                           gs_app_get_flatpak_kind (app),
-                                           gs_app_get_flatpak_name (app),
-                                           gs_app_get_flatpak_arch (app),
-                                           gs_app_get_flatpak_branch (app),
-                                           gs_plugin_flatpak_progress_cb, app,
-                                           cancellable, error);
-       if (xref == NULL) {
-               gs_app_set_state_recover (app);
-               return FALSE;
-       }
-
-       /* state is known */
-       gs_app_set_state (app, AS_APP_STATE_INSTALLED);
-       return TRUE;
+       return gs_flatpak_update_app (plugin, priv->installation, app,
+                                     cancellable, error);
 }
 
 gboolean
@@ -1289,121 +194,6 @@ gs_plugin_file_to_app (GsPlugin *plugin,
                       GError **error)
 {
        GsPluginData *priv = gs_plugin_get_data (plugin);
-       g_autofree gchar *content_type = NULL;
-       g_autofree gchar *id_prefixed = NULL;
-       g_autoptr(GBytes) appstream_gz = NULL;
-       g_autoptr(GBytes) icon_data = NULL;
-       g_autoptr(GBytes) metadata = NULL;
-       g_autoptr(GsApp) app = NULL;
-       g_autoptr(FlatpakBundleRef) xref_bundle = NULL;
-       const gchar *mimetypes[] = {
-               "application/vnd.flatpak",
-               NULL };
-
-       /* does this match any of the mimetypes we support */
-       content_type = gs_utils_get_content_type (file, cancellable, error);
-       if (content_type == NULL)
-               return FALSE;
-       if (!g_strv_contains (mimetypes, content_type))
-               return TRUE;
-
-       /* load bundle */
-       xref_bundle = flatpak_bundle_ref_new (file, error);
-       if (xref_bundle == NULL) {
-               g_prefix_error (error, "error loading bundle: ");
-               return FALSE;
-       }
-
-       /* create a virtual ID */
-       id_prefixed = gs_plugin_flatpak_build_id (priv->installation,
-                                                 FLATPAK_REF (xref_bundle));
-
-       /* load metadata */
-       app = gs_app_new (id_prefixed);
-       gs_app_set_kind (app, AS_APP_KIND_DESKTOP);
-       gs_app_set_state (app, AS_APP_STATE_AVAILABLE_LOCAL);
-       gs_app_set_size_installed (app, flatpak_bundle_ref_get_installed_size (xref_bundle));
-       gs_plugin_flatpak_set_metadata (app, FLATPAK_REF (xref_bundle));
-       metadata = flatpak_bundle_ref_get_metadata (xref_bundle);
-       if (!gs_plugin_flatpak_set_app_metadata (plugin,
-                                                app,
-                                                g_bytes_get_data (metadata, NULL),
-                                                g_bytes_get_size (metadata),
-                                                error))
-               return FALSE;
-
-       /* load AppStream */
-       appstream_gz = flatpak_bundle_ref_get_appstream (xref_bundle);
-       if (appstream_gz != NULL) {
-               g_autoptr(GZlibDecompressor) decompressor = NULL;
-               g_autoptr(GInputStream) stream_gz = NULL;
-               g_autoptr(GInputStream) stream_data = NULL;
-               g_autoptr(GBytes) appstream = NULL;
-               g_autoptr(AsStore) store = NULL;
-               g_autofree gchar *id = NULL;
-               AsApp *item;
-
-               /* decompress data */
-               decompressor = g_zlib_decompressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP);
-               stream_gz = g_memory_input_stream_new_from_bytes (appstream_gz);
-               if (stream_gz == NULL)
-                       return FALSE;
-               stream_data = g_converter_input_stream_new (stream_gz,
-                                                           G_CONVERTER (decompressor));
-
-               appstream = g_input_stream_read_bytes (stream_data,
-                                                      0x100000, /* 1Mb */
-                                                      cancellable,
-                                                      error);
-               if (appstream == NULL)
-                       return FALSE;
-               store = as_store_new ();
-               if (!as_store_from_bytes (store, appstream, cancellable, error))
-                       return FALSE;
-
-               /* find app */
-               id = g_strdup_printf ("%s.desktop", gs_app_get_flatpak_name (app));
-               item = as_store_get_app_by_id (store, id);
-               if (item == NULL) {
-                       g_set_error (error,
-                                    GS_PLUGIN_ERROR,
-                                    GS_PLUGIN_ERROR_FAILED,
-                                    "application %s not found",
-                                    id);
-                       return FALSE;
-               }
-
-               /* copy details from AppStream to app */
-               if (!gs_appstream_refine_app (plugin, app, item, error))
-                       return FALSE;
-       }
-
-       /* load icon */
-       icon_data = flatpak_bundle_ref_get_icon (xref_bundle,
-                                                64 * gs_plugin_get_scale (plugin));
-       if (icon_data == NULL)
-               icon_data = flatpak_bundle_ref_get_icon (xref_bundle, 64);
-       if (icon_data != NULL) {
-               g_autoptr(GInputStream) stream_icon = NULL;
-               g_autoptr(GdkPixbuf) pixbuf = NULL;
-               stream_icon = g_memory_input_stream_new_from_bytes (icon_data);
-               pixbuf = gdk_pixbuf_new_from_stream (stream_icon, cancellable, error);
-               if (pixbuf == NULL)
-                       return FALSE;
-               gs_app_set_pixbuf (app, pixbuf);
-       } else {
-               g_autoptr(AsIcon) icon = NULL;
-               icon = as_icon_new ();
-               as_icon_set_kind (icon, AS_ICON_KIND_STOCK);
-               as_icon_set_name (icon, "application-x-executable");
-               gs_app_add_icon (app, icon);
-       }
-
-       /* not quite true: this just means we can update this specific app */
-       if (flatpak_bundle_ref_get_origin (xref_bundle))
-               gs_app_add_quirk (app, AS_APP_QUIRK_HAS_SOURCE);
-
-       g_debug ("created local app: %s", gs_app_to_string (app));
-       gs_app_list_add (list, app);
-       return TRUE;
+       return gs_flatpak_file_to_app (plugin, priv->installation, list, file,
+                                      cancellable, error);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]