Reorganized the Python plugin code.

1 files changed, 43 insertions, 33 deletions

diff --git a/plugins/pychrysalide/analysis/module.c b/plugins/pychrysalide/analysis/module.c
index 60f08ce..cafb4fa 100644
--- a/plugins/pychrysalide/analysis/module.c
+++ b/plugins/pychrysalide/analysis/module.c
@@ -40,27 +40,26 @@
 #include "contents/module.h"
 #include "db/module.h"
 #include "types/module.h"
-#include "../access.h"
+#include "../helpers.h"
 
 
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : module = module dont la définition est à compléter.          *
+*  Paramètres  : super = module dont la définition est à compléter.           *
 *                                                                             *
-*  Description : Ajoute le module 'analysis' au module Python.                *
+*  Description : Ajoute le module 'analysis' à un module Python.              *
 *                                                                             *
-*  Retour      : -                                                            *
+*  Retour      : Bilan de l'opération.                                        *
 *                                                                             *
 *  Remarques   : -                                                            *
 *                                                                             *
 ******************************************************************************/
 
-bool add_analysis_module_to_python_module(PyObject *super)
+bool add_analysis_module(PyObject *super)
 {
     bool result;                            /* Bilan à retourner           */
     PyObject *module;                       /* Sous-module mis en place    */
-    int ret;                                /* Bilan d'un appel            */
 
     static PyModuleDef py_chrysalide_analysis_module = {
 
@@ -73,43 +72,54 @@ bool add_analysis_module_to_python_module(PyObject *super)
 
     };
 
-    result = false;
+    module = build_python_module(super, &py_chrysalide_analysis_module);
 
-    module = PyModule_Create(&py_chrysalide_analysis_module);
-    if (module == NULL) return false;
+    result = (module != NULL);
 
-    ret = PyState_AddModule(super, &py_chrysalide_analysis_module);
-    if (ret != 0) goto loading_failed;
+    if (result) result = add_analysis_contents_module(module);
+    if (result) result = add_analysis_db_module(module);
+    if (result) result = add_analysis_types_module(module);
 
-    ret = _PyImport_FixupBuiltin(module, "pychrysalide.analysis");
-    if (ret != 0) goto loading_failed;
+    if (!result)
+        Py_XDECREF(module);
 
-    Py_INCREF(module);
-    ret = PyModule_AddObject(super, "analysis", module);
-    if (ret != 0) goto loading_failed;
+    return result;
 
-    result = true;
+}
 
-    result &= register_python_binary_content(module);
-    result &= register_python_loaded_content(module);
 
-    result &= register_python_content_explorer(module);
-    result &= register_python_content_resolver(module);
-    result &= register_python_loaded_binary(module);
-    result &= register_python_instr_block(module);
-    result &= register_python_binary_routine(module);
-    result &= register_python_data_type(module);
-    result &= register_python_study_project(module);
-    result &= register_python_binary_variable(module);
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : -                                                            *
+*                                                                             *
+*  Description : Intègre les objets du module 'analysis'.                     *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
 
-    result &= add_analysis_contents_module_to_python_module(module);
-    result &= add_analysis_db_module_to_python_module(module);
-    result &= add_analysis_types_module_to_python_module(module);
+bool populate_analysis_module(void)
+{
+    bool result;                            /* Bilan à retourner           */
 
-    if (result)
-        register_access_to_python_module("pychrysalide.analysis", module);
+    result = true;
 
- loading_failed:
+    if (result) result = ensure_python_loaded_binary_is_registered();
+    if (result) result = ensure_python_instr_block_is_registered();
+    if (result) result = ensure_python_binary_content_is_registered();
+    if (result) result = ensure_python_loaded_content_is_registered();
+    if (result) result = ensure_python_content_explorer_is_registered();
+    if (result) result = ensure_python_content_resolver_is_registered();
+    if (result) result = ensure_python_study_project_is_registered();
+    if (result) result = ensure_python_binary_routine_is_registered();
+    if (result) result = ensure_python_data_type_is_registered();
+    if (result) result = ensure_python_binary_variable_is_registered();
+
+    if (result) result = populate_analysis_contents_module();
+    if (result) result = populate_analysis_db_module();
+    if (result) result = populate_analysis_types_module();
 
     assert(result);