core: Move pull logic into an API

The general trend should be becoming more of a shared library with
command line wrappers.

Makefile-ostree.am

@@ -86,7 +86,9 @@ ostree_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
 if USE_LIBSOUP
 ostree_SOURCES += src/ostree/ostree-fetcher.h \
 	src/ostree/ostree-fetcher.c \
+	src/ostree/ostree-pull.h \
 	src/ostree/ostree-pull.c \
+	src/ostree/ot-builtin-pull.c \
 	$(NULL)
 
 ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)

src/ostree/ostree-pull.c

@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
  *
- * Copyright (C) 2011,2012 Colin Walters <walters@verbum.org>
+ * Copyright (C) 2011,2012,2013 Colin Walters <walters@verbum.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -73,16 +73,7 @@
 #include "ot-builtins.h"
 
 #include "ostree-fetcher.h"
-
+#include "ostree-pull.h"
-
-gboolean verbose;
-gboolean opt_related;
-
-static GOptionEntry options[] = {
-  { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Show more information", NULL },
-  { "related", 0, 0, G_OPTION_ARG_NONE, &opt_related, "Download related commits", NULL },
-  { NULL },
-};
 
 typedef struct {
   enum {
@@ -100,6 +91,7 @@ typedef struct {
 
 typedef struct {
   OstreeRepo   *repo;
+  OstreePullFlags flags;
   char         *remote_name;
   OstreeRepoMode remote_mode;
   OstreeFetcher *fetcher;
@@ -787,7 +779,7 @@ scan_commit_object (OtPullData         *pull_data,
                                  cancellable, error))
     goto out;
   
-  if (opt_related)
+  if (pull_data->flags & OSTREE_PULL_FLAGS_RELATED)
     {
       const char *name;
       gs_unref_variant GVariant *csum_v = NULL;
@@ -1188,18 +1180,19 @@ load_remote_repo_config (OtPullData    *pull_data,
 }
 
 gboolean
-ostree_builtin_pull (int argc, char **argv, GFile *repo_path, GError **error)
+ostree_pull (OstreeRepo               *repo,
+             const char               *remote_name,
+             char                    **refs_to_fetch,
+             OstreePullFlags           flags,
+             GCancellable             *cancellable,
+             GError                  **error)
 {
-  GOptionContext *context;
   gboolean ret = FALSE;
   GHashTableIter hash_iter;
   gpointer key, value;
-  int i;
-  GCancellable *cancellable = NULL;
   gboolean tls_permissive = FALSE;
   OstreeFetcherConfigFlags fetcher_flags = 0;
   gs_free char *remote_key = NULL;
-  gs_unref_object OstreeRepo *repo = NULL;
   gs_free char *remote_config_content = NULL;
   gs_free char *path = NULL;
   gs_free char *baseurl = NULL;
@@ -1221,18 +1214,9 @@ ostree_builtin_pull (int argc, char **argv, GFile *repo_path, GError **error)
 
   memset (pull_data, 0, sizeof (*pull_data));
 
-  context = g_option_context_new ("REMOTE [BRANCH...] - Download data from remote repository");
-  g_option_context_add_main_entries (context, options, NULL);
-
-  if (!g_option_context_parse (context, &argc, &argv, error))
-    goto out;
-
-  repo = ostree_repo_new (repo_path);
-  if (!ostree_repo_check (repo, error))
-    goto out;
-
   pull_data->async_error = error;
   pull_data->loop = g_main_loop_new (NULL, FALSE);
+  pull_data->flags = flags;
 
   pull_data->repo = repo;
 
@@ -1243,15 +1227,9 @@ ostree_builtin_pull (int argc, char **argv, GFile *repo_path, GError **error)
   pull_data->requested_metadata = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                          (GDestroyNotify)g_free, NULL);
 
-  if (argc < 2)
-    {
-      ot_util_usage_error (context, "REMOTE must be specified", error);
-      goto out;
-    }
-
   start_time = g_get_monotonic_time ();
 
-  pull_data->remote_name = g_strdup (argv[1]);
+  pull_data->remote_name = g_strdup (remote_name);
   config = ostree_repo_get_config (repo);
 
   remote_key = g_strdup_printf ("remote \"%s\"", pull_data->remote_name);
@@ -1297,11 +1275,12 @@ ostree_builtin_pull (int argc, char **argv, GFile *repo_path, GError **error)
   updated_refs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
   commits_to_fetch = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
-  if (argc > 2)
+  if (refs_to_fetch != NULL)
     {
-      for (i = 2; i < argc; i++)
+      char **strviter;
+      for (strviter = refs_to_fetch; *strviter; strviter++)
         {
-          const char *branch = argv[i];
+          const char *branch = *strviter;
           char *contents;
 
           if (ostree_validate_checksum_string (branch, NULL))
@@ -1475,8 +1454,6 @@ ostree_builtin_pull (int argc, char **argv, GFile *repo_path, GError **error)
   if (pull_data->loop)
     g_main_loop_unref (pull_data->loop);
   g_strfreev (configured_branches);
-  if (context)
-    g_option_context_free (context);
   g_clear_object (&pull_data->fetcher);
   g_free (pull_data->remote_name);
   if (pull_data->base_uri)

src/ostree/ostree-pull.h

@@ -0,0 +1,42 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2013 Colin Walters <walters@verbum.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the licence or (at
+ * your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __OT_PULL_H__
+#define __OT_PULL_H__
+
+#include "ostree.h"
+
+G_BEGIN_DECLS
+
+typedef enum {
+  OSTREE_PULL_FLAGS_NONE,
+  OSTREE_PULL_FLAGS_RELATED
+} OstreePullFlags;
+
+gboolean ostree_pull (OstreeRepo        *repo,
+                      const char        *remote_name,
+                      char             **refs_to_fetch,
+                      OstreePullFlags    flags,
+                      GCancellable      *cancellable,
+                      GError           **error);
+
+G_END_DECLS
+
+#endif /* __OT_PRUNE_H__ */

src/ostree/ot-builtin-pull.c

@@ -0,0 +1,89 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2011,2013 Colin Walters <walters@verbum.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Colin Walters <walters@verbum.org>
+ */
+
+#include "config.h"
+
+#include "ot-builtins.h"
+#include "ostree.h"
+#include "ostree-pull.h"
+#include "ostree-repo-file.h"
+
+#include <gio/gunixoutputstream.h>
+#include <glib/gi18n.h>
+
+gboolean opt_related;
+
+static GOptionEntry options[] = {
+  { "related", 0, 0, G_OPTION_ARG_NONE, &opt_related, "Download related commits", NULL },
+  { NULL }
+};
+
+gboolean
+ostree_builtin_pull (int argc, char **argv, GFile *repo_path, GError **error)
+{
+  GOptionContext *context;
+  gboolean ret = FALSE;
+  GCancellable *cancellable = NULL;
+  const char *remote;
+  OstreePullFlags pullflags = 0;
+  gs_unref_object OstreeRepo *repo = NULL;
+  gs_unref_ptrarray GPtrArray *refs_to_fetch = NULL;
+
+  context = g_option_context_new ("REMOTE [BRANCH...] - Download data from remote repository");
+  g_option_context_add_main_entries (context, options, NULL);
+
+  if (!g_option_context_parse (context, &argc, &argv, error))
+    goto out;
+
+  repo = ostree_repo_new (repo_path);
+  if (!ostree_repo_check (repo, error))
+    goto out;
+
+  if (argc < 2)
+    {
+      ot_util_usage_error (context, "REMOTE must be specified", error);
+      goto out;
+    }
+  remote = argv[1];
+
+  if (argc > 2)
+    {
+      int i;
+      refs_to_fetch = g_ptr_array_new ();
+      for (i = 2; i < argc; i++)
+        g_ptr_array_add (refs_to_fetch, argv[i]);
+      g_ptr_array_add (refs_to_fetch, NULL);
+    }
+
+  if (opt_related)
+    pullflags |= OSTREE_PULL_FLAGS_RELATED;
+
+  if (!ostree_pull (repo, remote, refs_to_fetch ? (char**)refs_to_fetch->pdata : NULL,
+                    pullflags, cancellable, error))
+    goto out;
+ 
+  ret = TRUE;
+ out:
+  if (context)
+    g_option_context_free (context);
+  return ret;
+}