girepository: Split arguments of gi_repository_dump()

Accepting two filenames as a string comma-separated string seems like a
layering violation: this is a public API which could be used in places
other than directly off a set of command line arguments.

Move the command line argument parsing to the command line callback.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3155

girepository/gdump.c

@@ -521,33 +521,41 @@ dump_error_quark (GQuark quark, const char *symbol, GOutputStream *out)
 
 /**
  * gi_repository_dump:
- * @arg: Comma-separated pair of input and output filenames
+ * @input_filename: (type filename): Input filename (for example `input.txt`)
+ * @output_filename: (type filename): Output filename (for example `output.xml`)
  * @error: a %GError
  *
- * Argument specified is a comma-separated pair of filenames; i.e. of
+ * Dump the introspection data from the types specified in @input_filename to
- * the form "input.txt,output.xml".  The input file should be a
+ * @output_filename.
+ *
+ * The input file should be a
  * UTF-8 Unix-line-ending text file, with each line containing either
- * "get-type:" followed by the name of a GType _get_type function, or
+ * `get-type:` followed by the name of a [type@GObject.Type] `_get_type`
- * "error-quark:" followed by the name of an error quark function.  No
+ * function, or `error-quark:` followed by the name of an error quark function.
- * extra whitespace is allowed.
+ * No extra whitespace is allowed.
  *
- * The output file should already exist, but be empty.  This function will
+ * This function will overwrite the contents of the output file.
- * overwrite its contents.
  *
- * Returns: %TRUE on success, %FALSE on error
+ * Returns: true on success, false on error
+ * Since: 2.80
  */
 #ifndef GI_COMPILATION
 static gboolean
-dump_irepository (const char *arg, GError **error) G_GNUC_UNUSED;
+dump_irepository (const char  *input_filename,
+                  const char  *output_filename,
+                  GError     **error) G_GNUC_UNUSED;
 static gboolean
-dump_irepository (const char *arg, GError **error)
+dump_irepository (const char  *input_filename,
+                  const char  *output_filename,
+                  GError     **error)
 #else
 gboolean
-gi_repository_dump (const char *arg, GError **error)
+gi_repository_dump (const char  *input_filename,
+                    const char  *output_filename,
+                    GError     **error)
 #endif
 {
   GHashTable *output_types;
-  char **args;
   GFile *input_file;
   GFile *output_file;
   GFileInputStream *input;
@@ -567,12 +575,8 @@ gi_repository_dump (const char *arg, GError **error)
       return FALSE;
     }
 
-  args = g_strsplit (arg, ",", 2);
+  input_file = g_file_new_for_path (input_filename);
-
+  output_file = g_file_new_for_path (output_filename);
-  input_file = g_file_new_for_path (args[0]);
-  output_file = g_file_new_for_path (args[1]);
-
-  g_strfreev (args);
 
   input = g_file_read (input_file, NULL, error);
   g_object_unref (input_file);

girepository/girepository.c

@@ -1740,8 +1740,11 @@ gi_repository_introspect_cb (const char *option_name,
 			     GError **error)
 {
   GError *tmp_error = NULL;
-  gboolean ret = gi_repository_dump (value, &tmp_error);
+  char **args;
-  if (!ret)
+
+  args = g_strsplit (value, ",", 2);
+
+  if (!gi_repository_dump (args[0], args[1], &tmp_error))
     {
       g_error ("Failed to extract GType data: %s",
 	       tmp_error->message);

girepository/girepository.h

@@ -203,7 +203,9 @@ GOptionGroup * gi_repository_get_option_group (void);
 
 
 GI_AVAILABLE_IN_ALL
-gboolean       gi_repository_dump  (const char *arg, GError **error);
+gboolean       gi_repository_dump  (const char  *input_filename,
+                                    const char  *output_filename,
+                                    GError     **error);
 
 /**
  * GIRepositoryError: