Add FLATPAK_QUERY_FLAGS_ALL_ARCHES for list_remote_refs()

This allows flatpak_installation_list_remote_refs_sync_full() to list
refs for all arches on remotes that use the new subsummary format.

Fixes #4252

4 files changed, 55 insertions, 6 deletions

diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h
index accfe061..3c69928c 100644
--- a/common/flatpak-dir-private.h
+++ b/common/flatpak-dir-private.h
@@ -155,6 +155,11 @@ gboolean flatpak_remote_state_ensure_subsummary (FlatpakRemoteState *self,
                                                  gboolean            only_cached,
                                                  GCancellable       *cancellable,
                                                  GError            **error);
+gboolean flatpak_remote_state_ensure_subsummary_all_arches (FlatpakRemoteState *self,
+                                                            FlatpakDir         *dir,
+                                                            gboolean            only_cached,
+                                                            GCancellable       *cancellable,
+                                                            GError            **error);
 gboolean flatpak_remote_state_allow_ref (FlatpakRemoteState *self,
                                          const char *ref);
 gboolean flatpak_remote_state_lookup_ref (FlatpakRemoteState *self,
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index d4f5e5c5..1c331907 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -498,6 +498,35 @@ flatpak_remote_state_ensure_subsummary (FlatpakRemoteState *self,
 }
 
 gboolean
+flatpak_remote_state_ensure_subsummary_all_arches (FlatpakRemoteState *self,
+                                                   FlatpakDir         *dir,
+                                                   gboolean            only_cached,
+                                                   GCancellable       *cancellable,
+                                                   GError            **error)
+{
+  if (self->index_ht == NULL)
+    return TRUE; /* No subsummaries, got all arches anyway */
+
+  GLNX_HASH_TABLE_FOREACH (self->index_ht, const char *, arch)
+    {
+      g_autoptr(GError) local_error = NULL;
+
+      if (!flatpak_remote_state_ensure_subsummary (self, dir, arch, only_cached, cancellable, &local_error))
+        {
+          /* Don't error on non-cached subsummaries */
+          if (only_cached && g_error_matches (local_error, FLATPAK_ERROR, FLATPAK_ERROR_NOT_CACHED))
+            continue;
+
+          g_propagate_error (error, g_steal_pointer (&local_error));
+          return FALSE;
+        }
+    }
+
+  return TRUE;
+}
+
+
+gboolean
 flatpak_remote_state_allow_ref (FlatpakRemoteState *self,
                                 const char *ref)
 {
diff --git a/common/flatpak-installation.c b/common/flatpak-installation.c
index 62e23a25..0daf3d66 100644
--- a/common/flatpak-installation.c
+++ b/common/flatpak-installation.c
@@ -2418,22 +2418,35 @@ flatpak_installation_list_remote_refs_sync_full (FlatpakInstallation *self,
   GHashTableIter iter;
   gpointer key;
   gpointer value;
+  gboolean only_sideloaded = (flags & FLATPAK_QUERY_FLAGS_ONLY_SIDELOADED) != 0;
+  gboolean only_cached = (flags & FLATPAK_QUERY_FLAGS_ONLY_CACHED) != 0;
+  gboolean all_arches = (flags & FLATPAK_QUERY_FLAGS_ALL_ARCHES) != 0;
 
   dir = flatpak_installation_get_dir (self, error);
   if (dir == NULL)
     return NULL;
 
-  if (flags & FLATPAK_QUERY_FLAGS_ONLY_SIDELOADED)
-    state = flatpak_dir_get_remote_state_local_only (dir, remote_or_uri, cancellable, error);
+  if (only_sideloaded)
+    {
+      state = flatpak_dir_get_remote_state_local_only (dir, remote_or_uri, cancellable, error);
+      if (state == NULL)
+        return NULL;
+    }
   else
-    state = flatpak_dir_get_remote_state (dir, remote_or_uri, (flags & FLATPAK_QUERY_FLAGS_ONLY_CACHED) != 0, cancellable, error);
-  if (state == NULL)
-    return NULL;
+    {
+      state = flatpak_dir_get_remote_state (dir, remote_or_uri, only_cached, cancellable, error);
+      if (state == NULL)
+        return NULL;
+
+      if (all_arches &&
+          !flatpak_remote_state_ensure_subsummary_all_arches (state, dir, only_cached, cancellable, error))
+        return NULL;
+    }
 
   if (!flatpak_dir_list_remote_refs (dir, state, &ht,
                                      cancellable, &local_error))
     {
-      if (flags & FLATPAK_QUERY_FLAGS_ONLY_SIDELOADED)
+      if (only_sideloaded)
         {
           /* Just return no sideloaded refs rather than a summary download failed error if there are none */
           return g_steal_pointer (&refs);
diff --git a/common/flatpak-installation.h b/common/flatpak-installation.h
index 899163e5..2fb0fd59 100644
--- a/common/flatpak-installation.h
+++ b/common/flatpak-installation.h
@@ -131,6 +131,7 @@ typedef enum {
  * lot more efficient if you're doing many requests.
  * @FLATPAK_QUERY_FLAGS_ONLY_SIDELOADED: Only list refs available from sideload
  * repos; see flatpak(1). (Snce: 1.7)
+ * @FLATPAK_QUERY_FLAGS_ALL_ARCHES: Include refs from all arches, not just the primary ones. (Snce: 1.11.2)
  *
  * Flags to alter the behavior of e.g flatpak_installation_list_remote_refs_sync_full().
  *
@@ -140,6 +141,7 @@ typedef enum {
   FLATPAK_QUERY_FLAGS_NONE        = 0,
   FLATPAK_QUERY_FLAGS_ONLY_CACHED = (1 << 0),
   FLATPAK_QUERY_FLAGS_ONLY_SIDELOADED = (1 << 1),
+  FLATPAK_QUERY_FLAGS_ALL_ARCHES = (1 << 2),
 } FlatpakQueryFlags;
 
 /**