diff options
Diffstat (limited to 'plugins/pychrysalide/core/logs.c')
| -rw-r--r-- | plugins/pychrysalide/core/logs.c | 95 |
1 files changed, 38 insertions, 57 deletions
diff --git a/plugins/pychrysalide/core/logs.c b/plugins/pychrysalide/core/logs.c index afab7ab..d4fd0da 100644 --- a/plugins/pychrysalide/core/logs.c +++ b/plugins/pychrysalide/core/logs.c @@ -31,6 +31,7 @@ #include <core/logs.h> +#include "constants.h" #include "../access.h" #include "../helpers.h" #include "../pychrysa.h" @@ -46,9 +47,6 @@ static PyObject *py_logs_set_verbosity(PyObject *, PyObject *); /* Affiche un message dans le journal des messages système. */ static PyObject *py_logs_log_message(PyObject *, PyObject *); -/* Définit les constantes pour les types de message. */ -static bool define_python_log_constants(PyObject *); - /****************************************************************************** @@ -69,9 +67,19 @@ static PyObject *py_logs_get_verbosity(PyObject *self, PyObject *args) PyObject *result; /* Conversion à retourner */ LogMessageType verbosity; /* Niveau de filtre de message */ +#define LOGS_GET_VERBOSITY_METHOD PYTHON_METHOD_DEF \ +( \ + get_verbosity, "", \ + METH_NOARGS, py_logs, \ + "Get the log verbosity, as a pychrysalide.core.LogMessageType level.\n" \ + "\n" \ + "A *COUNT* value means no log gets displayed, a null value means" \ + " all kinds of logs get printed." \ +) + verbosity = get_log_verbosity(); - result = PyLong_FromUnsignedLong(verbosity); + result = cast_with_constants_group_from_module("pychrysalide.core", "LogMessageType", verbosity); return result; @@ -96,6 +104,17 @@ static PyObject *py_logs_set_verbosity(PyObject *self, PyObject *args) PyObject *result; /* Bilan à retourner */ unsigned long verbosity; /* Niveau de filtre de message */ +#define LOGS_SET_VERBOSITY_METHOD PYTHON_METHOD_DEF \ +( \ + set_verbosity, "level, /", \ + METH_VARARGS, py_logs, \ + "Set the log verbosity. The provided level has to be castable into a" \ + " pychrysalide.core.LogMessageType value.\n" \ + "\n" \ + "A *COUNT* value means no log gets displayed, a null value means" \ + " all kinds of logs get printed." \ +) + if (!PyArg_ParseTuple(args, "k", &verbosity)) return NULL; @@ -128,6 +147,17 @@ static PyObject *py_logs_log_message(PyObject *self, PyObject *args) unsigned long type; /* Espèce du message */ const char *msg; /* Contenu du message */ +#define LOGS_LOG_MESSAGE_METHOD PYTHON_METHOD_DEF \ +( \ + log_message, "type, msg, /", \ + METH_VARARGS, py_logs, \ + "Display a message in the log window, in graphical mode, or in the" \ + " console output if none.\n" \ + "\n" \ + "The type of the message has to be a pychrysalide.core.LogMessageType" \ + " value." \ +) + if (!PyArg_ParseTuple(args, "ks", &type, &msg)) return NULL; @@ -159,37 +189,6 @@ static PyObject *py_logs_log_message(PyObject *self, PyObject *args) /****************************************************************************** * * -* Paramètres : dict = dictionnaire de module à compléter. * -* * -* Description : Définit les constantes pour les types de message. * -* * -* Retour : true en cas de succès de l'opération, false sinon. * -* * -* Remarques : - * -* * -******************************************************************************/ - -static bool define_python_log_constants(PyObject *dict) -{ - bool result; /* Bilan à retourner */ - - result = true; - - result &= PyModDict_AddULongMacro(dict, LMT_INFO); - result &= PyModDict_AddULongMacro(dict, LMT_PROCESS); - result &= PyModDict_AddULongMacro(dict, LMT_WARNING); - result &= PyModDict_AddULongMacro(dict, LMT_BAD_BINARY); - result &= PyModDict_AddULongMacro(dict, LMT_ERROR); - result &= PyModDict_AddULongMacro(dict, LMT_EXT_ERROR); - result &= PyModDict_AddULongMacro(dict, LMT_COUNT); - - return result; - -} - - -/****************************************************************************** -* * * Paramètres : - * * * * Description : Définit une extension du module 'core' à compléter. * @@ -204,27 +203,12 @@ bool populate_core_module_with_logs(void) { bool result; /* Bilan à retourner */ PyObject *module; /* Module à recompléter */ - PyObject *dict; /* Dictionnaire dudit module */ static PyMethodDef py_logs_methods[] = { - - { - "get_verbosity", py_logs_get_verbosity, - METH_NOARGS, - "get_verbosity(, /)\n--\n\nGet the log verbosity." - }, - { - "set_verbosity", py_logs_set_verbosity, - METH_VARARGS, - "set_verbosity(, /)\n--\n\nSet the log verbosity." - }, - { - "log_message", py_logs_log_message, - METH_VARARGS, - "log_message(type, msg, /)\n--\n\nDisplay a message in the log window, if any." - }, + LOGS_GET_VERBOSITY_METHOD, + LOGS_SET_VERBOSITY_METHOD, + LOGS_LOG_MESSAGE_METHOD, { NULL } - }; module = get_access_to_python_module("pychrysalide.core"); @@ -232,10 +216,7 @@ bool populate_core_module_with_logs(void) result = register_python_module_methods(module, py_logs_methods); if (result) - { - dict = PyModule_GetDict(module); - result = define_python_log_constants(dict); - } + result = define_core_logs_constants(module); return result; |