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

conf: allow a WpConf to be loaded without fragments

Browse Source 
Use WpProperties to indicate that searching for and loading
conf.d fragments can/should be skipped.

Signed-off-by: James Calligeros <jcalligeros99@gmail.com>
This commit is contained in:
James Calligeros
2024-03-30 16:25:50 +10:00
parent 42666e2054
commit 34040d8e44
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/wp/conf.c
View File

@@ -151,7 +151,8 @@ wp_conf_class_init (WpConfClass * klass)
*
* \ingroup wpconf
* \param name the name of the configuration file
* \param properties (transfer full) (nullable): unused, reserved for future use
* \param properties (transfer full) (nullable): a WpProperties with keys
* specifying how to load the WpConf object
* \returns (transfer full): a new WpConf object
*/
WpConf *
@@ -170,7 +171,8 @@ wp_conf_new (const gchar * name, WpProperties * properties)
*
* \ingroup wpconf
* \param name the name of the configuration file
* \param properties (transfer full) (nullable): unused, reserved for future use
* \param properties (transfer full) (nullable): a WpProperties with keys
* specifying how to load the WpConf object
* \param error (out) (nullable): return location for a GError, or NULL
* \returns (transfer full) (nullable): a new WpConf object, or NULL
* if an error occurred
@@ -278,12 +280,18 @@ open_and_load_sections (WpConf * self, const gchar *path, GError ** error)
gboolean
wp_conf_open (WpConf * self, GError ** error)
{
const gchar *no_frags = NULL;
g_return_val_if_fail (WP_IS_CONF (self), FALSE);
g_autofree gchar *path = NULL;
g_autoptr (WpIterator) iterator = NULL;
g_auto (GValue) value = G_VALUE_INIT;
if (self->properties) {
no_frags = wp_properties_get (self->properties, "no-fragments");
}
/*
* open the config file - if the path supplied is absolute,
* wp_base_dirs_find_file will ignore WP_BASE_DIRS_CONFIGURATION
@@ -297,19 +305,21 @@ wp_conf_open (WpConf * self, GError ** error)
g_clear_pointer (&path, g_free);
/* open the .conf.d/ fragments */
path = g_strdup_printf ("%s.d", self->name);
iterator = wp_base_dirs_new_files_iterator (WP_BASE_DIRS_CONFIGURATION, path,
".conf");
if (!no_frags) {
path = g_strdup_printf ("%s.d", self->name);
iterator = wp_base_dirs_new_files_iterator (WP_BASE_DIRS_CONFIGURATION, path,
".conf");
for (; wp_iterator_next (iterator, &value); g_value_unset (&value)) {
const gchar *filename = g_value_get_string (&value);
for (; wp_iterator_next (iterator, &value); g_value_unset (&value)) {
const gchar *filename = g_value_get_string (&value);
wp_info_object (self, "opening fragment file: %s", filename);
wp_info_object (self, "opening fragment file: %s", filename);
g_autoptr (GError) e = NULL;
if (!open_and_load_sections (self, filename, &e)) {
wp_warning_object (self, "failed to open '%s': %s", filename, e->message);
continue;
g_autoptr (GError) e = NULL;
if (!open_and_load_sections (self, filename, &e)) {
wp_warning_object (self, "failed to open '%s': %s", filename, e->message);
continue;
}
}
}