improve module config dialog load speed

SVN revision: 82820

ChangeLog

@@ -3,6 +3,7 @@
         * prevent windows dragged from one screen to another from being larger than the destination screen
         * add new APIs for getting module .desktop files
         * track module directories
+        * improve module config dialog load speed
 
 2013-01-14 Brian Miculcy
 

NEWS

@@ -70,6 +70,7 @@ Improvements:
     * compositor now applies focus/urgency state to windows on first show
     * prevent windows dragged from one screen to another from being larger than the destination screen
     * track module directories
+    * improve module config dialog load speed
 
 Fixes:
     * Backlight, screenlock and screensaver don't check for fullscreen windows - we have presentation mode for that.

src/bin/e_int_config_modules.c

@@ -75,7 +75,7 @@ static void         _toolbar_select_cb(void *data, void *data2);
 
 static CFType      *_cftype_find(E_Config_Dialog_Data *cfdata, const char *key, const char *name, const char *icon);
 static CFType      *_cftype_new(const char *key, const char *name, const char *icon);
-static void         _load_modules(const char *dir, Eina_Hash *types_hash);
+static void         _load_module(E_Module_Desktop *md, Eina_Hash *types_hash);
 static Eina_Bool    _types_list_create_foreach_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
 static int          _types_list_sort(const void *data1, const void *data2);
 
@@ -105,28 +105,26 @@ static void *
 _create_data(E_Config_Dialog *cfd __UNUSED__)
 {
    Eina_Hash *types_hash;
-   Eina_List *modules_paths, *l;
-   E_Path_Dir *epd;
-   E_Config_Dialog_Data *cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   Eina_List *mods;
+   E_Module_Desktop *md;
+   E_Config_Dialog_Data *cfdata;
+
+   cfdata = E_NEW(E_Config_Dialog_Data, 1);
 
    types_hash = eina_hash_string_superfast_new(NULL);
-   if (!types_hash) return cfdata;
-
-   modules_paths = e_path_dir_list_get(path_modules);
-   if (!modules_paths)
+   mods = e_module_desktop_list();
+   if (!mods)
      {
         eina_hash_free(types_hash);
         return cfdata;
      }
 
-   EINA_LIST_FOREACH(modules_paths, l, epd)
+   EINA_LIST_FREE(mods, md)
      {
-        if (ecore_file_is_dir(epd->dir))
-          _load_modules(epd->dir, types_hash);
+        _load_module(md, types_hash);
+        e_module_desktop_free(md);
      }
 
-   e_path_dir_list_free(modules_paths);
-
    eina_hash_foreach(types_hash, _types_list_create_foreach_cb, cfdata);
    eina_hash_free(types_hash);
    cfdata->types = eina_list_sort(cfdata->types, -1, _types_list_sort);
@@ -470,87 +468,54 @@ _cftype_new_from_key(const char *key)
 }
 
 static void
-_load_modules(const char *dir, Eina_Hash *types_hash)
+_load_module(E_Module_Desktop *md, Eina_Hash *types_hash)
 {
-   Eina_List *files;
-   char modpath[PATH_MAX];
-   char *mod;
-   int modpathlen;
+   CFType *cft;
+   CFModule *cfm;
+   const char *type, *mod;
+   Eina_Bool new_type = EINA_FALSE;
 
-   modpathlen = snprintf(modpath, sizeof(modpath), "%s/", dir);
-   if (modpathlen >= (int)sizeof(modpath)) return;
+   mod = ecore_file_file_get(md->dir);
+   if (md->desktop->x)
+     type = eina_hash_find(md->desktop->x, "X-Enlightenment-ModuleType");
+   else
+     type = NULL;
+   if (!type) type = "utils";  // todo: warn?
 
-   files = ecore_file_ls(dir);
-   EINA_LIST_FREE(files, mod)
+   cft = eina_hash_find(types_hash, type);
+   if (cft)
      {
-        Efreet_Desktop *desk;
-        CFType *cft;
-        CFModule *cfm;
-        const char *type;
-        Eina_Bool new_type;
-
-        if (!strcmp(mod, "comp")) goto end_mod;
-        snprintf(modpath + modpathlen, sizeof(modpath) - modpathlen,
-                 "%s/module.desktop", mod);
-        if (!ecore_file_exists(modpath)) goto end_mod;
-        if (!(desk = efreet_desktop_new(modpath))) goto end_mod;
-
-        if (desk->x)
-          type = eina_hash_find(desk->x, "X-Enlightenment-ModuleType");
-        else
-          type = NULL;
-        if (!type) type = "utils";  // todo: warn?
-
-        cft = eina_hash_find(types_hash, type);
-        if (cft)
-          {
-             new_type = EINA_FALSE;
-             if ((cft->modules_hash) &&
-                 (eina_hash_find(cft->modules_hash, mod)))
-               goto end_desktop;
-          }
-        else
-          {
-             cft = _cftype_new_from_key(type);
-             if (cft) new_type = EINA_TRUE;
-             else goto end_desktop;
-          }
-
-        cfm = _module_new(mod, desk);
-        if (!cfm)
-          {
-             if (new_type) _cftype_free(cft);
-             goto end_desktop;
-          }
-
-        if (!cft->modules_hash)
-          cft->modules_hash = eina_hash_string_superfast_new(NULL);
-        if (!cft->modules_hash)
-          {
-             if (new_type) _cftype_free(cft);
-             _module_free(cfm);
-             goto end_desktop;
-          }
-        eina_hash_direct_add(cft->modules_hash, cfm->short_name, cfm);
-        // TODO be paranoid about hash add failure, otherwise it will leak
-
-        cft->modules = eina_list_append(cft->modules, cfm);
-        // TODO be paranoid about list append failure, otherwise it will leak
-        cfm->module = e_module_find(mod);
-        if (cfm->module)
-          cfm->enabled = e_module_enabled_get(cfm->module);
-        else
-          cfm->enabled = 0;
-
-        if (new_type)
-          eina_hash_direct_add(types_hash, cft->key, cft);
-        // TODO be paranoid about hash add failure, otherwise it will leak
-
-end_desktop:
-        efreet_desktop_free(desk);
-end_mod:
-        free(mod);
+        new_type = EINA_FALSE;
+        if ((cft->modules_hash) &&
+            (eina_hash_find(cft->modules_hash, mod)))
+          return;
      }
+   else
+     {
+        cft = _cftype_new_from_key(type);
+        if (cft) new_type = EINA_TRUE;
+        else return;
+     }
+
+   cfm = _module_new(mod, md->desktop);
+   if (!cfm)
+     {
+        if (new_type) _cftype_free(cft);
+        return;
+     }
+
+   if (!cft->modules_hash)
+     cft->modules_hash = eina_hash_string_superfast_new(NULL);
+   eina_hash_direct_add(cft->modules_hash, cfm->short_name, cfm);
+   cft->modules = eina_list_append(cft->modules, cfm);
+   cfm->module = e_module_find(mod);
+   if (cfm->module)
+     cfm->enabled = e_module_enabled_get(cfm->module);
+   else
+     cfm->enabled = 0;
+
+   if (new_type)
+     eina_hash_direct_add(types_hash, cft->key, cft);
 }
 
 static int