From fedb0e5bd9326270698507fae402a21ac5dc10db Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 10 Apr 2018 14:44:57 +0200
Subject: [PATCH] dir: Pass summary and collection_id to
 fetch_remote_repo_metadata()

All callers need to get this anyway, so lets only do it once.

Closes: #1575
Approved by: alexlarsson
---
 common/flatpak-dir.c | 32 ++++++++++++++++++++++----------
 common/flatpak-dir.h |  4 ----
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 30d04239..9837c928 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -102,6 +102,14 @@ static char * flatpak_dir_lookup_ref_from_summary (FlatpakDir          *self,
                                                    GCancellable        *cancellable,
                                                    GError             **error);
 
+static gboolean flatpak_dir_fetch_remote_repo_metadata (FlatpakDir    *self,
+                                                        const char    *remote_name,
+                                                        GVariant      *summary,
+                                                        const char    *collection_id,
+                                                        GCancellable  *cancellable,
+                                                        GError       **error);
+
+
 typedef struct
 {
   GBytes *bytes;
@@ -3048,6 +3056,7 @@ flatpak_dir_get_remote_metadata (FlatpakDir    *self,
 {
   g_autoptr(GVariant) metadata = NULL;
   g_autofree char *collection_id = NULL;
+  g_autoptr(GVariant) summary_v = NULL;
 
   if (!flatpak_dir_ensure_repo (self, cancellable, error))
     return NULL;
@@ -3055,13 +3064,12 @@ flatpak_dir_get_remote_metadata (FlatpakDir    *self,
   if (!repo_get_remote_collection_id (self->repo, remote_name, &collection_id, error))
     return NULL;
 
+  summary_v = fetch_remote_summary_file (self, remote_name, NULL, cancellable, error);
+  if (summary_v == NULL)
+    return NULL;
+
   if (collection_id == NULL)
     {
-      g_autoptr(GVariant) summary_v = NULL;
-
-      summary_v = fetch_remote_summary_file (self, remote_name, NULL, cancellable, error);
-      if (summary_v == NULL)
-        return NULL;
 
       metadata = g_variant_get_child_value (summary_v, 1);
     }
@@ -3072,7 +3080,7 @@ flatpak_dir_get_remote_metadata (FlatpakDir    *self,
       g_autoptr(GVariant) commit_v = NULL;
 
       /* Make sure the branch is up to date. */
-      if (!flatpak_dir_fetch_remote_repo_metadata (self, remote_name, cancellable, error))
+      if (!flatpak_dir_fetch_remote_repo_metadata (self, remote_name, summary_v, collection_id, cancellable, error))
         return NULL;
 
       /* Look up the commit containing the latest repository metadata. */
@@ -9892,6 +9900,8 @@ flatpak_dir_fetch_remote_default_branch (FlatpakDir   *self,
 gboolean
 flatpak_dir_fetch_remote_repo_metadata (FlatpakDir    *self,
                                         const char    *remote_name,
+                                        GVariant      *summary,
+                                        const char    *collection_id,
                                         GCancellable  *cancellable,
                                         GError       **error)
 {
@@ -9902,6 +9912,8 @@ flatpak_dir_fetch_remote_repo_metadata (FlatpakDir    *self,
   g_autofree char *checksum_from_repo = NULL;
   g_autofree char *refspec = NULL;
 
+  g_assert (collection_id != NULL);
+
   /* We can only fetch metadata if we’re going to verify it with GPG. */
   if (!ostree_repo_remote_get_gpg_verify (self->repo, remote_name,
                                           &gpg_verify, error))
@@ -9913,9 +9925,9 @@ flatpak_dir_fetch_remote_repo_metadata (FlatpakDir    *self,
   /* Look up the checksum as advertised by the summary file. If it differs from
    * what we currently have on disk, try and pull the updated ostree-metadata ref.
    * This is how we implement caching. Ignore failure and pull the ref anyway. */
-  checksum_from_summary = flatpak_dir_lookup_ref_from_summary (self, remote_name,
-                                                               OSTREE_REPO_METADATA_REF,
-                                                               NULL, NULL, NULL, NULL);
+  if (!flatpak_summary_lookup_ref (summary, collection_id, OSTREE_REPO_METADATA_REF, &checksum_from_summary, NULL))
+    return flatpak_fail (error, "No such ref (%s, %s) in remote %s", collection_id, OSTREE_REPO_METADATA_REF, remote_name);
+
   refspec = g_strdup_printf ("%s:%s", remote_name, OSTREE_REPO_METADATA_REF);
   if (!ostree_repo_resolve_rev (self->repo, refspec, TRUE, &checksum_from_repo, error))
     return FALSE;
@@ -10282,7 +10294,7 @@ flatpak_dir_update_remote_configuration (FlatpakDir   *self,
     return FALSE;
 
   if (collection_id != NULL &&
-      !flatpak_dir_fetch_remote_repo_metadata (self, remote, cancellable, error))
+      !flatpak_dir_fetch_remote_repo_metadata (self, remote, summary, collection_id, cancellable, error))
     return FALSE;
 
   if (flatpak_dir_use_system_helper (self, NULL))
diff --git a/common/flatpak-dir.h b/common/flatpak-dir.h
index 8192e98f..d17c3a69 100644
--- a/common/flatpak-dir.h
+++ b/common/flatpak-dir.h
@@ -628,10 +628,6 @@ gboolean   flatpak_dir_list_remote_refs (FlatpakDir   *self,
                                          GHashTable  **refs,
                                          GCancellable *cancellable,
                                          GError      **error);
-gboolean flatpak_dir_fetch_remote_repo_metadata (FlatpakDir    *self,
-                                                 const char    *remote_name,
-                                                 GCancellable  *cancellable,
-                                                 GError       **error);
 char *   flatpak_dir_fetch_remote_title (FlatpakDir   *self,
                                          const char   *remote,
                                          GCancellable *cancellable,