[gnome-software/987-removing-layered-local-package-on-silverblue-does-not-notify-the-user-that-it-was-actually] rpm-ostree: Use pending install/remove application states

[Milan Crha <mcrha src gnome org>]

commit b7e739915c2cbcde5ba59cd393a059edd12e7b17
Author: Milan Crha <mcrha redhat com>
Date:   Fri Apr 16 11:57:56 2021 +0200

    rpm-ostree: Use pending install/remove application states
    
    This can distinguish whether an application is installed/removed, but
    a restart is needed to finish the operation.

 plugins/rpm-ostree/gs-plugin-rpm-ostree.c | 42 +++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
index f21108d22..ad087891a 100644
--- a/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
+++ b/plugins/rpm-ostree/gs-plugin-rpm-ostree.c
@@ -1398,7 +1398,7 @@ gs_plugin_app_install (GsPlugin *plugin,
        }
 
        /* state is known */
-       gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+       gs_app_set_state (app, GS_APP_STATE_PENDING_INSTALL);
 
        /* get the new icon from the package */
        gs_app_set_local_file (app, NULL);
@@ -1468,8 +1468,12 @@ gs_plugin_app_remove (GsPlugin *plugin,
                return FALSE;
        }
 
-       /* state is not known: we don't know if we can re-install this app */
-       gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
+       if (gs_app_has_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT)) {
+               gs_app_set_state (app, GS_APP_STATE_PENDING_REMOVE);
+       } else {
+               /* state is not known: we don't know if we can re-install this app */
+               gs_app_set_state (app, GS_APP_STATE_UNKNOWN);
+       }
 
        return TRUE;
 }
@@ -1506,6 +1510,29 @@ find_packages_by_provides (DnfSack *sack,
        return g_steal_pointer (&pkgs);
 }
 
+static gboolean
+gs_rpm_ostree_has_launchable (GsApp *app)
+{
+       const gchar *desktop_id;
+       GDesktopAppInfo *desktop_appinfo;
+
+       if (gs_app_has_quirk (app, GS_APP_QUIRK_NOT_LAUNCHABLE) ||
+           gs_app_has_quirk (app, GS_APP_QUIRK_PARENTAL_NOT_LAUNCHABLE))
+               return FALSE;
+
+       desktop_id = gs_app_get_launchable (app, AS_LAUNCHABLE_KIND_DESKTOP_ID);
+       if (!desktop_id)
+               desktop_id = gs_app_get_id (app);
+       if (!desktop_id)
+               return FALSE;
+
+       desktop_appinfo = gs_utils_get_desktop_app_info (desktop_id);
+       if (!desktop_appinfo)
+               return FALSE;
+
+       return TRUE;
+}
+
 static gboolean
 resolve_installed_packages_app (GsPlugin *plugin,
                                 GHashTable *packages,
@@ -1522,8 +1549,13 @@ resolve_installed_packages_app (GsPlugin *plugin,
 
        if (pkg) {
                gs_app_set_version (app, rpm_ostree_package_get_evr (pkg));
-               if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN)
-                       gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+               if (gs_app_get_state (app) == GS_APP_STATE_UNKNOWN) {
+                       /* Kind of hack, pending installs do not have available the desktop file */
+                       if (gs_app_get_kind (app) != AS_COMPONENT_KIND_DESKTOP_APP || 
gs_rpm_ostree_has_launchable (app))
+                               gs_app_set_state (app, GS_APP_STATE_INSTALLED);
+                       else
+                               gs_app_set_state (app, GS_APP_STATE_PENDING_INSTALL);
+               }
                if ((rpm_ostree_package_get_name (pkg) &&
                     g_hash_table_contains (layered_packages, rpm_ostree_package_get_name (pkg))) ||
                    (rpm_ostree_package_get_nevra (pkg) &&