Add variant of osinfo_install_script_generate_for_media*() that
generates the script into a file.
---
osinfo/libosinfo.syms | 4 +
osinfo/osinfo_install_script.c | 250 +++++++++++++++++++++++++++++++++--------
osinfo/osinfo_install_script.h | 17 +++
3 files changed, 224 insertions(+), 47 deletions(-)
diff --git a/osinfo/libosinfo.syms b/osinfo/libosinfo.syms
index ba4c020..3906f89 100644
--- a/osinfo/libosinfo.syms
+++ b/osinfo/libosinfo.syms
@@ -511,6 +511,10 @@ LIBOSINFO_0.2.12 {
osinfo_install_script_generate_for_media_async;
osinfo_install_script_generate_for_media_finish;
+ osinfo_install_script_generate_output_for_media;
+ osinfo_install_script_generate_output_for_media_async;
+ osinfo_install_script_generate_output_for_media_finish;
+
osinfo_media_get_volume_size;
} LIBOSINFO_0.2.11;
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 621c56f..a251557 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -1061,6 +1061,25 @@ GFile *osinfo_install_script_generate_output_finish(OsinfoInstallScript *script,
error);
}
+/**
+ * osinfo_install_script_generate_output_for_media_finish:
+ * @script: the install script
+ * @res: a #GAsyncResult
+ * @error: The location where to store any error, or NULL
+ *
+ * Returns: (transfer full): a file containing the script, or NULL on error.
+ *
+ * Since: 0.2.12
+ */
+GFile *osinfo_install_script_generate_output_for_media_finish(OsinfoInstallScript *script,
+ GAsyncResult *res,
+ GError **error)
+{
+ return osinfo_install_script_generate_finish_common(script,
+ res,
+ error);
+}
+
struct _OsinfoInstallScriptGenerateSyncData {
GMainLoop *loop;
GError *error;
@@ -1081,6 +1100,19 @@ static void osinfo_install_script_generate_output_done(GObject *src,
g_main_loop_quit(data->loop);
}
+static void osinfo_install_script_generate_output_for_media_done(GObject *src,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ OsinfoInstallScriptGenerateSyncData *data = user_data;
+
+ data->file =
+ osinfo_install_script_generate_output_for_media_finish(OSINFO_INSTALL_SCRIPT(src),
+ res,
+ &data->error);
+ g_main_loop_quit(data->loop);
+}
+
static void osinfo_install_script_generate_output_close_file(GObject *src,
GAsyncResult *res,
gpointer user_data)
@@ -1279,28 +1311,14 @@ static void osinfo_install_script_generate_output_write_file(GObject *src,
}
}
-/**
- * osinfo_install_script_generate_output_async:
- * @script: the install script
- * @os: the os
- * @config: the install script config
- * @output_dir: the directory where file containing the output script
- * will be written
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @callback: Function to call when result of this call is ready
- * @user_data: The user data to pass to @callback, or %NULL
- *
- * Asynchronous variant of #osinfo_install_script_generate_output(). From the
- * callback, call #osinfo_install_script_generate_output_finish() to conclude
- * this call and get the generated script.
- */
-void osinfo_install_script_generate_output_async(OsinfoInstallScript *script,
- OsinfoOs *os,
- OsinfoInstallConfig *config,
- GFile *output_dir,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+static void osinfo_install_script_generate_output_async_common(OsinfoInstallScript *script,
+ OsinfoOs *os,
+ OsinfoMedia *media,
+ OsinfoInstallConfig *config,
+ GFile *output_dir,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
const gchar *filename;
const gchar *prefix;
@@ -1312,15 +1330,23 @@ void osinfo_install_script_generate_output_async(OsinfoInstallScript *script,
data->res = g_simple_async_result_new(G_OBJECT(script),
callback,
user_data,
- osinfo_install_script_generate_output_async);
+ osinfo_install_script_generate_output_async_common);
data->cancellable = cancellable;
data->error = data_sync->error;
- data->output = osinfo_install_script_generate(script,
- os,
- config,
- cancellable,
- &data->error);
+ if (media != NULL) {
+ data->output = osinfo_install_script_generate_for_media (script,
+ media,
+ config,
+ cancellable,
+ &data->error);
+ } else {
+ data->output = osinfo_install_script_generate(script,
+ os,
+ config,
+ cancellable,
+ &data->error);
+ }
data->output_pos = 0;
data->output_len = strlen(data->output);
@@ -1348,25 +1374,45 @@ void osinfo_install_script_generate_output_async(OsinfoInstallScript *script,
}
/**
- * osinfo_install_script_generate_output:
+ * osinfo_install_script_generate_output_async:
* @script: the install script
- * @os: the os entity
+ * @os: the os
* @config: the install script config
* @output_dir: the directory where file containing the output script
* will be written
* @cancellable: (allow-none): a #GCancellable, or %NULL
- * @error: The location where to store any error, or %NULL
- *
- * Creates an install script that is written to the returned file.
+ * @callback: Function to call when result of this call is ready
+ * @user_data: The user data to pass to @callback, or %NULL
*
- * Returns: (transfer full): a file containing the script
+ * Asynchronous variant of #osinfo_install_script_generate_output(). From the
+ * callback, call #osinfo_install_script_generate_output_finish() to conclude
+ * this call and get the generated script.
*/
-GFile *osinfo_install_script_generate_output(OsinfoInstallScript *script,
- OsinfoOs *os,
- OsinfoInstallConfig *config,
- GFile *output_dir,
- GCancellable *cancellable,
- GError **error)
+void osinfo_install_script_generate_output_async(OsinfoInstallScript *script,
+ OsinfoOs *os,
+ OsinfoInstallConfig *config,
+ GFile *output_dir,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ osinfo_install_script_generate_output_async_common(script,
+ os,
+ NULL,
+ config,
+ output_dir,
+ cancellable,
+ callback,
+ user_data);
+}
+
+static GFile *osinfo_install_script_generate_output_common(OsinfoInstallScript *script,
+ OsinfoOs *os,
+ OsinfoMedia *media,
+ OsinfoInstallConfig *config,
+ GFile *output_dir,
+ GCancellable *cancellable,
+ GError **error)
{
GMainLoop *loop = g_main_loop_new(g_main_context_get_thread_default(),
TRUE);
@@ -1374,13 +1420,25 @@ GFile *osinfo_install_script_generate_output(OsinfoInstallScript *script,
loop, NULL, NULL, NULL
};
- osinfo_install_script_generate_output_async(script,
- os,
- config,
- output_dir,
- cancellable,
- osinfo_install_script_generate_output_done,
- &data);
+ if (media != NULL) {
+ osinfo_install_script_generate_output_for_media_async
+ (script,
+ media,
+ config,
+ output_dir,
+ cancellable,
+ osinfo_install_script_generate_output_for_media_done,
+ &data);
+ } else {
+ osinfo_install_script_generate_output_async
+ (script,
+ os,
+ config,
+ output_dir,
+ cancellable,
+ osinfo_install_script_generate_output_done,
+ &data);
+ }
if (g_main_loop_is_running(loop))
g_main_loop_run(loop);
@@ -1394,6 +1452,104 @@ GFile *osinfo_install_script_generate_output(OsinfoInstallScript *script,
}
/**
+ * osinfo_install_script_generate_output:
+ * @script: the install script
+ * @os: the os entity
+ * @config: the install script config
+ * @output_dir: the directory where file containing the output script
+ * will be written
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @error: The location where to store any error, or %NULL
+ *
+ * Creates an install script that is written to the returned file.
+ *
+ * Returns: (transfer full): a file containing the script
+ */
+GFile *osinfo_install_script_generate_output(OsinfoInstallScript *script,
+ OsinfoOs *os,
+ OsinfoInstallConfig *config,
+ GFile *output_dir,
+ GCancellable *cancellable,
+ GError **error)
+{
+ return osinfo_install_script_generate_output_common(script,
+ os,
+ NULL,
+ config,
+ output_dir,
+ cancellable,
+ error);
+}
+
+/**
+ * osinfo_install_script_generate_output_for_media_async:
+ * @script: the install script
+ * @media: the media
+ * @config: the install script config
+ * @output_dir: the directory where file containing the output script
+ * will be written
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @callback: Function to call when result of this call is ready
+ * @user_data: The user data to pass to @callback, or %NULL
+ *
+ * Asynchronous variant of #osinfo_install_script_generate_output_for_media().
+ * From the callback, call
+ * #osinfo_install_script_generate_output_for_media_finish() to conclude this
+ * call and get the generated file.
+ *
+ * Since: 0.2.12
+ */
+void osinfo_install_script_generate_output_for_media_async(OsinfoInstallScript *script,
+ OsinfoMedia *media,
+ OsinfoInstallConfig *config,
+ GFile *output_dir,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ osinfo_install_script_generate_output_async_common(script,
+ NULL,
+ media,
+ config,
+ output_dir,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
+ * osinfo_install_script_generate_output_for_media:
+ * @script: the install script
+ * @media: the media
+ * @config: the install script config
+ * @output_dir: the directory where file containing the output script
+ * will be written
+ * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @error: The location where to store any error, or %NULL
+ *
+ * Creates an install script that is written to the returned file.
+ *
+ * Returns: (transfer full): a file containing the script.
+ *
+ * Since: 0.2.12
+ */
+GFile *osinfo_install_script_generate_output_for_media(OsinfoInstallScript *script,
+ OsinfoMedia *media,
+ OsinfoInstallConfig *config,
+ GFile *output_dir,
+ GCancellable *cancellable,
+ GError **error)
+{
+ return osinfo_install_script_generate_output_common(script,
+ NULL,
+ media,
+ config,
+ output_dir,
+ cancellable,
+ error);
+}
+
+/**
* osinfo_install_script_generate_command_line:
* @script: the install script
* @os: the os entity
diff --git a/osinfo/osinfo_install_script.h b/osinfo/osinfo_install_script.h
index cd0b033..0a6afcb 100644
--- a/osinfo/osinfo_install_script.h
+++ b/osinfo/osinfo_install_script.h
@@ -215,6 +215,23 @@ gchar *osinfo_install_script_generate_for_media(OsinfoInstallScript *script,
GCancellable *cancellable,
GError **error);
+void osinfo_install_script_generate_output_for_media_async(OsinfoInstallScript *script,
+ OsinfoMedia *media,
+ OsinfoInstallConfig *config,
+ GFile *output_dir,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+GFile *osinfo_install_script_generate_output_for_media_finish(OsinfoInstallScript *script,
+ GAsyncResult *res,
+ GError **error);
+GFile *osinfo_install_script_generate_output_for_media(OsinfoInstallScript *script,
+ OsinfoMedia *media,
+ OsinfoInstallConfig *config,
+ GFile *output_dir,
+ GCancellable *cancellable,
+ GError **error);
+
gchar *osinfo_install_script_generate_command_line(OsinfoInstallScript *script,
OsinfoOs *os,
OsinfoInstallConfig *config);
--
2.1.0
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
