From 62e09b406b8a7fb517c294d2c0b149a83f2cc64b Mon Sep 17 00:00:00 2001
From: Phaedrus Leeds <mwleeds@protonmail.com>
Date: Tue, 2 Nov 2021 10:49:25 -0700
Subject: [PATCH] search: Don't strip .desktop suffix overzealously

This commit changes the search command to properly output the app ID for
IDs that end in .desktop, e.g. to print org.telegram.desktop rather than
org.telegram.

Fixes https://github.com/flatpak/flatpak/issues/4535
---
 app/flatpak-builtins-search.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/flatpak-builtins-search.c b/app/flatpak-builtins-search.c
index d7f2a4c1db..d2a04895b8 100644
--- a/app/flatpak-builtins-search.c
+++ b/app/flatpak-builtins-search.c
@@ -194,6 +194,33 @@ as_app_equal (AsApp *app1, AsApp *app2)
 }
 #endif
 
+/* This returns the app ID with the ".desktop" suffix stripped. In most cases
+ * that is what as_app_get_id_filename() does, but if the ID actually ends in
+ * .desktop it is stripped anyway and e.g.  "org.telegram" is returned instead
+ * of "org.telegram.desktop" (which is a bug in appstream-glib). See
+ * https://github.com/hughsie/appstream-glib/issues/420 and
+ * https://github.com/flatpak/flatpak/issues/4535
+ */
+static const char *
+_app_get_id_no_suffix (AsApp *app)
+{
+  const gchar *id_with_suffix = NULL;
+  const gchar *id_stripped = NULL;
+  id_with_suffix = as_app_get_id_no_prefix (app);
+  id_stripped = as_app_get_id_filename (app);
+  if (flatpak_is_valid_name (id_stripped, -1, NULL))
+    return id_stripped;
+  else
+    {
+      g_autofree char *id_with_desktop = g_strconcat (id_stripped, ".desktop", NULL);
+      if (flatpak_is_valid_name (id_with_desktop, -1, NULL) &&
+          g_strcmp0 (id_with_suffix, id_with_desktop) == 0)
+        return id_with_suffix;
+      else
+        return id_stripped;
+    }
+}
+
 static int
 compare_apps (MatchResult *a, AsApp *b)
 {
@@ -210,7 +237,7 @@ static void
 print_app (Column *columns, MatchResult *res, FlatpakTablePrinter *printer)
 {
   const char *version = as_app_get_version (res->app);
-  const char *id = as_app_get_id_filename (res->app);
+  const char *id = _app_get_id_no_suffix (res->app);
   const char *name = as_app_get_localized_name (res->app);
   const char *comment = as_app_get_localized_comment (res->app);
   guint i;
@@ -307,7 +334,7 @@ flatpak_builtin_search (int argc, char **argv, GCancellable *cancellable, GError
           guint score = as_app_search_matches (app, search_text);
           if (score == 0)
             {
-              const char *app_id = as_app_get_id_filename (app);
+              const char *app_id = _app_get_id_no_suffix (app);
               if (strcasestr (app_id, search_text) != NULL)
                 score = 50;
               else