From a1745e1a79ea1c41cc62e91b346a2a9961997a76 Mon Sep 17 00:00:00 2001
From: Joaquim Rocha <jrocha@endlessm.com>
Date: Fri, 24 Nov 2017 14:56:28 +0100
Subject: [PATCH] lib/remote: Add a method to return the URL

When using dynamic remotes (LAN and USB), we cannot use their name with
the common remote related ops (ostree_repo_remote_...) because ostree
doesn't keep this type of remotes in its internal hash table.
Unfortunately this means that we cannot access the URL of those remotes
either (in order to e.g. set the right URL for those remotes in
Flatpak).

Since the URL is actually stored in a key file that belongs to the
OstreeRemote, then we can simply allow users access to it through a
getter.

So this patch adds a method that allows to return the URL directly from
the OstreeRemote without having to go through the OstreeRepo.

The test-repo-finder-config is also updated by this patch to check if
the URL is correct.

Closes: #1353
Approved by: cgwalters
---
 apidoc/ostree-experimental-sections.txt  |  1 +
 src/libostree/libostree-experimental.sym |  1 +
 src/libostree/ostree-remote.c            | 18 ++++++++++++++++++
 src/libostree/ostree-remote.h            |  3 +++
 tests/test-repo-finder-config.c          |  2 ++
 5 files changed, 25 insertions(+)

diff --git a/apidoc/ostree-experimental-sections.txt b/apidoc/ostree-experimental-sections.txt
index fc383922..60daaca5 100644
--- a/apidoc/ostree-experimental-sections.txt
+++ b/apidoc/ostree-experimental-sections.txt
@@ -19,6 +19,7 @@ OstreeRemote
 ostree_remote_ref
 ostree_remote_unref
 ostree_remote_get_name
+ostree_remote_get_url
 <SUBSECTION Standard>
 ostree_remote_get_type
 </SECTION>
diff --git a/src/libostree/libostree-experimental.sym b/src/libostree/libostree-experimental.sym
index 3b991c42..b83ad1b0 100644
--- a/src/libostree/libostree-experimental.sym
+++ b/src/libostree/libostree-experimental.sym
@@ -93,4 +93,5 @@ global:
 LIBOSTREE_2017.14_EXPERIMENTAL {
 global:
   ostree_remote_get_type;
+  ostree_remote_get_url;
 } LIBOSTREE_2017.13_EXPERIMENTAL;
diff --git a/src/libostree/ostree-remote.c b/src/libostree/ostree-remote.c
index 605a7eb9..b75640e7 100644
--- a/src/libostree/ostree-remote.c
+++ b/src/libostree/ostree-remote.c
@@ -180,3 +180,21 @@ ostree_remote_get_name (OstreeRemote *remote)
 
   return remote->name;
 }
+
+/**
+ * ostree_remote_get_url:
+ * @remote: an #OstreeRemote
+ *
+ * Get the URL from the remote.
+ *
+ * Returns: (transfer full): the remote's URL
+ * Since: 2017.14
+ */
+gchar *
+ostree_remote_get_url (OstreeRemote *remote)
+{
+  g_return_val_if_fail (remote != NULL, NULL);
+  g_return_val_if_fail (remote->ref_count > 0, NULL);
+
+  return g_key_file_get_string (remote->options, remote->group, "url", NULL);
+}
diff --git a/src/libostree/ostree-remote.h b/src/libostree/ostree-remote.h
index 322fb96e..aa9bf731 100644
--- a/src/libostree/ostree-remote.h
+++ b/src/libostree/ostree-remote.h
@@ -57,4 +57,7 @@ void ostree_remote_unref (OstreeRemote *remote);
 _OSTREE_PUBLIC
 const gchar *ostree_remote_get_name (OstreeRemote *remote);
 
+_OSTREE_PUBLIC
+gchar *ostree_remote_get_url (OstreeRemote *remote);
+
 G_END_DECLS
diff --git a/tests/test-repo-finder-config.c b/tests/test-repo-finder-config.c
index 428e02eb..7eff53d2 100644
--- a/tests/test-repo-finder-config.c
+++ b/tests/test-repo-finder-config.c
@@ -284,11 +284,13 @@ test_repo_finder_config_mixed_configs (Fixture       *fixture,
           g_assert_cmpuint (g_hash_table_size (result->ref_to_checksum), ==, 2);
           g_assert_true (g_hash_table_contains (result->ref_to_checksum, &ref0));
           g_assert_true (g_hash_table_contains (result->ref_to_checksum, &ref1));
+          g_assert_cmpstr (ostree_remote_get_url (result->remote), ==, collection0_uri);
         }
       else if (g_strcmp0 (ostree_remote_get_name (result->remote), "remote1") == 0)
         {
           g_assert_cmpuint (g_hash_table_size (result->ref_to_checksum), ==, 1);
           g_assert_true (g_hash_table_contains (result->ref_to_checksum, &ref3));
+          g_assert_cmpstr (ostree_remote_get_url (result->remote), ==, collection1_uri);
         }
       else
         {