colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

state: remove support for groups and propagate save errors

Browse Source 
There is no real use for groups in our API. Just use the name of
the file as the default group and be done with it...
Storing multiple groups with this API is problematic because it
forces flushing the file to disk multiple times, one for each group,
and it's just more performant if we use a prefix in the keys
to implement some form of logical separation.

This commit also makes the GKeyFile a temporary object. As we
always load the file from the file system in _load()
and we always replace its contents with a new dictionary in _save(),
there is no point in keeping the keyfile's internal data structures
stored in memory.

Save errors are now also propagated to adhere to the programming
practices of GObject
This commit is contained in:
George Kiagiadakis
2021-06-04 18:22:48 +03:00
parent 4948f6f2f6
commit 38f7483793
7 changed files with 66 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/module-default-nodes.c
View File

@@ -57,14 +57,10 @@ wp_default_nodes_init (WpDefaultNodes * self)
static void
load_state (WpDefaultNodes * self)
{
g_autoptr (WpProperties) props = wp_state_load (self->state, NAME);
if (!props)
wp_warning_object (self, "could not load " NAME);
else {
for (gint i = 0; i < N_DEFAULT_NODES; i++) {
const gchar *value = wp_properties_get (props, DEFAULT_CONFIG_KEY[i]);
self->defaults[i].config_value = g_strdup (value);
}
g_autoptr (WpProperties) props = wp_state_load (self->state);
for (gint i = 0; i < N_DEFAULT_NODES; i++) {
const gchar *value = wp_properties_get (props, DEFAULT_CONFIG_KEY[i]);
self->defaults[i].config_value = g_strdup (value);
}
}
@@ -73,6 +69,7 @@ timeout_save_state_callback (gpointer data)
{
WpDefaultNodes *self = data;
g_autoptr (WpProperties) props = wp_properties_new_empty ();
g_autoptr (GError) error = NULL;
for (gint i = 0; i < N_DEFAULT_NODES; i++) {
if (self->defaults[i].config_value)
@@ -80,8 +77,8 @@ timeout_save_state_callback (gpointer data)
self->defaults[i].config_value);
}
if (!wp_state_save (self->state, NAME, props))
wp_warning_object (self, "could not save " NAME);
if (!wp_state_save (self->state, props, &error))
wp_warning_object (self, "%s", error->message);
g_clear_pointer (&self->timeout_source, g_source_unref);
return G_SOURCE_REMOVE;