diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2019-06-21 17:08:24 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2019-06-21 17:08:24 +0000 |
commit | a6f0eadb51aae5351a0cfd6b9da3dcba6b134e1a (patch) | |
tree | 5ba2452073fe58ff4411d8c62ad977f5ae37a5e4 | |
parent | 5b455175b4e9566da0e0f28ab6d00a75aa62fd1c (diff) | |
parent | 16fb81cd7e3a3586252fc5d185e5c2c95125d045 (diff) | |
download | gvdb-a6f0eadb51aae5351a0cfd6b9da3dcba6b134e1a.tar.gz |
Merge branch 'mcatanzaro/write-contents-async' into 'master'
Add gvdb_table_write_contents_async()
See merge request GNOME/gvdb!4
-rw-r--r-- | gvdb-builder.c | 102 | ||||
-rw-r--r-- | gvdb-builder.h | 11 |
2 files changed, 113 insertions, 0 deletions
diff --git a/gvdb-builder.c b/gvdb-builder.c index cdcd9e4..70c0ac1 100644 --- a/gvdb-builder.c +++ b/gvdb-builder.c @@ -511,6 +511,10 @@ gvdb_table_write_contents (GHashTable *table, FileBuilder *fb; GString *str; + g_return_val_if_fail (table != NULL, FALSE); + g_return_val_if_fail (filename != NULL, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + fb = file_builder_new (byteswap); file_builder_add_hash (fb, table, &root); str = file_builder_serialise (fb, root); @@ -520,3 +524,101 @@ gvdb_table_write_contents (GHashTable *table, return status; } + +typedef struct { + GBytes *contents; /* (owned) */ + GFile *file; /* (owned) */ +} WriteContentsData; + +static WriteContentsData * +write_contents_data_new (GBytes *contents, + GFile *file) +{ + WriteContentsData *data; + + data = g_slice_new (WriteContentsData); + data->contents = g_bytes_ref (contents); + data->file = g_object_ref (file); + + return data; +} + +static void +write_contents_data_free (WriteContentsData *data) +{ + g_bytes_unref (data->contents); + g_object_unref (data->file); + g_slice_free (WriteContentsData, data); +} + +static void +replace_contents_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GTask *task = user_data; + WriteContentsData *data = g_task_get_task_data (task); + GError *error = NULL; + + g_return_if_fail (g_task_get_source_tag (task) == gvdb_table_write_contents_async); + + if (!g_file_replace_contents_finish (data->file, result, NULL, &error)) + g_task_return_error (task, g_steal_pointer (&error)); + else + g_task_return_boolean (task, TRUE); + + g_object_unref (task); +} + +void +gvdb_table_write_contents_async (GHashTable *table, + const gchar *filename, + gboolean byteswap, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + struct gvdb_pointer root; + FileBuilder *fb; + WriteContentsData *data; + GString *str; + GBytes *bytes; + GFile *file; + GTask *task; + + g_return_if_fail (table != NULL); + g_return_if_fail (filename != NULL); + g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + + fb = file_builder_new (byteswap); + file_builder_add_hash (fb, table, &root); + str = file_builder_serialise (fb, root); + bytes = g_string_free_to_bytes (str); + + file = g_file_new_for_path (filename); + data = write_contents_data_new (bytes, file); + + task = g_task_new (NULL, cancellable, callback, user_data); + g_task_set_task_data (task, data, (GDestroyNotify)write_contents_data_free); + g_task_set_source_tag (task, gvdb_table_write_contents_async); + + g_file_replace_contents_async (file, str->str, str->len, + NULL, FALSE, + G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, + cancellable, replace_contents_cb, g_steal_pointer (&task)); + + g_bytes_unref (bytes); + g_object_unref (file); +} + +gboolean +gvdb_table_write_contents_finish (GHashTable *table, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (table != NULL, FALSE); + g_return_val_if_fail (g_task_is_valid (result, NULL), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + return g_task_propagate_boolean (G_TASK (result), error); +} diff --git a/gvdb-builder.h b/gvdb-builder.h index b4815f0..30757d0 100644 --- a/gvdb-builder.h +++ b/gvdb-builder.h @@ -51,5 +51,16 @@ gboolean gvdb_table_write_contents (GHashTa const gchar *filename, gboolean byteswap, GError **error); +G_GNUC_INTERNAL +void gvdb_table_write_contents_async (GHashTable *table, + const gchar *filename, + gboolean byteswap, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +G_GNUC_INTERNAL +gboolean gvdb_table_write_contents_finish (GHashTable *table, + GAsyncResult *result, + GError **error); #endif /* __gvdb_builder_h__ */ |