core: sort configuration files by name, reload them by priority (issue #1872)

3 files changed, 134 insertions, 13 deletions

diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 1bea236a6..725689af0 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -5586,13 +5586,41 @@ command_reload_file (struct t_config_file *config_file)
 }
 
 /*
+ * Compares two configuration files to sort them by priority (highest priority
+ * at beginning of list).
+ *
+ * Returns:
+ *   -1: config1 has higher priority than config2
+ *    1: config1 has same or lower priority than config2
+ */
+
+int
+command_reload_arraylist_cmp_config_cb (void *data,
+                                        struct t_arraylist *arraylist,
+                                        void *pointer1, void *pointer2)
+{
+    struct t_config_file *ptr_config1, *ptr_config2;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) arraylist;
+
+    ptr_config1 = (struct t_config_file *)pointer1;
+    ptr_config2 = (struct t_config_file *)pointer2;
+
+    return (ptr_config1->priority > ptr_config2->priority) ? -1 : 1;
+}
+
+
+/*
  * Callback for command "/reload": reloads a configuration file.
  */
 
 COMMAND_CALLBACK(reload)
 {
     struct t_config_file *ptr_config_file;
-    int i;
+    struct t_arraylist *all_configs;
+    int i, list_size;
 
     /* make C compiler happy */
     (void) pointer;
@@ -5619,11 +5647,33 @@ COMMAND_CALLBACK(reload)
     }
     else
     {
+        /*
+         * build a list of pointers to configs sorted by priority,
+         * so that configs with high priority are reloaded first
+         */
+        all_configs = arraylist_new (
+            32, 1, 1,
+            &command_reload_arraylist_cmp_config_cb, NULL,
+            NULL, NULL);
+        if (!all_configs)
+            COMMAND_ERROR;
+
         for (ptr_config_file = config_files; ptr_config_file;
              ptr_config_file = ptr_config_file->next_config)
         {
-            command_reload_file (ptr_config_file);
+            arraylist_add (all_configs, ptr_config_file);
         }
+
+        list_size = arraylist_size (all_configs);
+        for (i = 0; i < list_size; i++)
+        {
+            ptr_config_file = (struct t_config_file *)arraylist_get (
+                all_configs, i);
+            if (config_file_valid (ptr_config_file))
+                command_reload_file (ptr_config_file);
+        }
+
+        arraylist_free (all_configs);
     }
 
     return WEECHAT_RC_OK;
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index 3fa2f5b8b..e51652b5a 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -60,6 +60,33 @@ void config_file_option_free_data (struct t_config_option *option);
 
 
 /*
+ * Checks if a configuration file pointer is valid.
+ *
+ * Returns:
+ *   1: configuration file exists
+ *   0: configuration file does not exist
+ */
+
+int
+config_file_valid (struct t_config_file *config_file)
+{
+    struct t_config_file *ptr_config;
+
+    if (!config_file)
+        return 0;
+
+    for (ptr_config = config_files; ptr_config;
+         ptr_config = ptr_config->next_config)
+    {
+        if (ptr_config == config_file)
+            return 1;
+    }
+
+    /* configuration file not found */
+    return 0;
+}
+
+/*
  * Searches for a configuration file.
  */
 
@@ -67,15 +94,19 @@ struct t_config_file *
 config_file_search (const char *name)
 {
     struct t_config_file *ptr_config;
+    int rc;
 
     if (!name)
         return NULL;
 
-    for (ptr_config = config_files; ptr_config;
-         ptr_config = ptr_config->next_config)
+    for (ptr_config = last_config_file; ptr_config;
+         ptr_config = ptr_config->prev_config)
     {
-        if (string_strcasecmp (ptr_config->name, name) == 0)
+        rc = string_strcasecmp (ptr_config->name, name);
+        if (rc == 0)
             return ptr_config;
+        else if (rc < 0)
+            break;
     }
 
     /* configuration file not found */
@@ -88,7 +119,7 @@ config_file_search (const char *name)
  */
 
 struct t_config_file *
-config_file_config_find_pos (const char *name)
+config_file_find_pos (const char *name)
 {
     struct t_config_file *ptr_config;
 
@@ -107,6 +138,51 @@ config_file_config_find_pos (const char *name)
 }
 
 /*
+ * Inserts a configuration file (keeping files sorted by name).
+ */
+
+void
+config_file_config_insert (struct t_config_file *config_file)
+{
+    struct t_config_file *pos_config;
+
+    if (!config_file)
+        return;
+
+    if (config_files)
+    {
+        pos_config = config_file_find_pos (config_file->name);
+        if (pos_config)
+        {
+            /* insert config into the list (before config found) */
+            config_file->prev_config = pos_config->prev_config;
+            config_file->next_config = pos_config;
+            if (pos_config->prev_config)
+                (pos_config->prev_config)->next_config = config_file;
+            else
+                config_files = config_file;
+            pos_config->prev_config = config_file;
+        }
+        else
+        {
+            /* add config to the end */
+            config_file->prev_config = last_config_file;
+            config_file->next_config = NULL;
+            last_config_file->next_config = config_file;
+            last_config_file = config_file;
+        }
+    }
+    else
+    {
+        /* first config */
+        config_file->prev_config = NULL;
+        config_file->next_config = NULL;
+        config_files = config_file;
+        last_config_file = config_file;
+    }
+}
+
+/*
  * Creates a new configuration file.
  *
  * Returns pointer to new configuration file, NULL if error.
@@ -168,13 +244,7 @@ config_file_new (struct t_weechat_plugin *plugin, const char *name,
         new_config_file->sections = NULL;
         new_config_file->last_section = NULL;
 
-        new_config_file->prev_config = last_config_file;
-        new_config_file->next_config = NULL;
-        if (last_config_file)
-            last_config_file->next_config = new_config_file;
-        else
-            config_files = new_config_file;
-        last_config_file = new_config_file;
+        config_file_config_insert (new_config_file);
     }
 
     return new_config_file;
diff --git a/src/core/wee-config-file.h b/src/core/wee-config-file.h
index c0ab4dce2..3da27398b 100644
--- a/src/core/wee-config-file.h
+++ b/src/core/wee-config-file.h
@@ -169,6 +169,7 @@ struct t_config_option
 extern struct t_config_file *config_files;
 extern struct t_config_file *last_config_file;
 
+extern int config_file_valid (struct t_config_file *config_file);
 extern struct t_config_file *config_file_search (const char *name);
 extern struct t_config_file *config_file_new (struct t_weechat_plugin *plugin,
                                               const char *name,