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

lua/config: load split config files in alphanumeric order

Browse Source
This commit is contained in:
George Kiagiadakis
2021-02-12 17:33:54 +02:00
parent 0196b49453
commit 41a4c89a41
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/module-lua-scripting/config.c
View File

@@ -126,6 +126,12 @@ done:
return TRUE;
}
static gint
sort_filelist (gconstpointer a, gconstpointer b)
{
return g_strcmp0 (*(const gchar **) a, *(const gchar **) b);
}
gboolean
wp_lua_scripting_load_configuration (const gchar * conf_file,
WpCore * core, GError ** error)
@@ -154,17 +160,26 @@ wp_lua_scripting_load_configuration (const gchar * conf_file,
if (!conf_dir)
return FALSE;
/* sort files before loading them */
g_autoptr (GPtrArray) filenames = g_ptr_array_new ();
const gchar *filename = NULL;
while ((filename = g_dir_read_name (conf_dir))) {
/* Only parse files that have the proper extension */
if (g_str_has_suffix (filename, ".lua")) {
g_autofree gchar * file = g_build_filename (path, filename, NULL);
wp_info ("loading config file: %s", file);
if (!wplua_load_path (L, file, 0, 0, error))
return FALSE;
found = TRUE;
g_ptr_array_add (filenames, (gpointer) filename);
}
}
g_ptr_array_sort (filenames, sort_filelist);
/* load */
for (guint i = 0; i < filenames->len; i++) {
g_autofree gchar * file = g_build_filename (path,
g_ptr_array_index (filenames, i), NULL);
wp_info ("loading config file: %s", file);
if (!wplua_load_path (L, file, 0, 0, error))
return FALSE;
found = TRUE;
}
}
if (!found) {