X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/b39754f763284af8fc45de2d5b734b2ce072b8c7..2bee6a6e20b793a5a5749c28e7caa00e2a54c75d:/src/mod-python.c diff --git a/src/mod-python.c b/src/mod-python.c index 80c9401..4ffab92 100644 --- a/src/mod-python.c +++ b/src/mod-python.c @@ -669,6 +669,164 @@ emb_kill(UNUSED_ARG(PyObject* self), PyObject* args) { return Py_None; } +struct py_timeq_extra { + PyObject* func; + PyObject* arg; +}; + +static +void py_timeq_callback(void* data) { + struct py_timeq_extra* extra = (struct py_timeq_extra*)data; + + PyObject* retval = PyObject_Call(extra->func, extra->arg, NULL); + Py_XDECREF(retval); + + Py_DECREF(extra->func); + Py_DECREF(extra->arg); +} + +static PyObject* +emb_timeq_add(UNUSED_ARG(PyObject* self), PyObject* args) { + time_t when; + PyObject* func, *arg; + struct py_timeq_extra* extra; + + if (!PyArg_ParseTuple(args, "lOO", &when, &func, &arg)) + return NULL; + + if (!PyFunction_Check(func)) { + PyErr_SetString(PyExc_Exception, "first argument must be a function"); + return NULL; + } + + if (!PyTuple_Check(arg)) { + PyErr_SetString(PyExc_Exception, "second argument must be a tuple"); + return NULL; + } + + extra = malloc(sizeof(struct py_timeq_extra)); + if (extra == NULL) { + PyErr_SetString(PyExc_Exception, "out of memory"); + return NULL; + } + + Py_INCREF(func); + Py_INCREF(arg); + + extra->func = func; + extra->arg = arg; + + timeq_add(when, py_timeq_callback, (void*)extra); + + return Py_None; +} + +static PyObject* +emb_timeq_del(UNUSED_ARG(PyObject* self), PyObject* args) { + /* NOTE: + * This function will delete all python-added callbacks registered + * to run at the given time, regardless of their data. This is due to + * the unnecessary extra burden it would require to get the same data for + * multiple runs. + */ + time_t when; + + if (!PyArg_ParseTuple(args, "l", &when)) + return NULL; + + timeq_del(when, py_timeq_callback, NULL, TIMEQ_IGNORE_DATA); + + return Py_None; +} + +static int pyobj_config_make_dict(char const* key, void* data_, void* extra) { + struct record_data* data = (struct record_data*)data_; + PyObject* dict = (PyObject*)extra; + PyObject* value = NULL, *tmp; + size_t n, idx; + int success; + + switch (data->type) { + case RECDB_QSTRING: + value = PyString_FromString(data->d.qstring); + break; + + case RECDB_STRING_LIST: + value = PyList_New(data->d.slist->used); + if (value == NULL) + break; + + success = 1; + for (n = 0; n < data->d.slist->used; ++n) { + tmp = PyString_FromString(data->d.slist->list[n]); + if (tmp == NULL) { + success = 0; + break; + } + + if (PyList_SetItem(value, n, tmp)) { + Py_DECREF(tmp); + success = 0; + break; + } + } + if (!success) { + for (idx = 0; idx < n; ++idx) { + tmp = PyList_GET_ITEM(value, idx); + Py_DECREF(tmp); + PyList_SET_ITEM(value, idx, NULL); + } + Py_DECREF(value); + value = NULL; + } + break; + + case RECDB_OBJECT: + value = PyDict_New(); + if (value == NULL) + break; + + if (dict_foreach(data->d.object, pyobj_config_make_dict, (void*)value) != NULL) { + PyDict_Clear(value); + value = NULL; + break; + } + + break; + + default: + value = Py_None; + } + + if (value == NULL) + return 1; + + if (PyDict_SetItemString(dict, key, value)) + return 1; + + return 0; +} + +static PyObject* +emb_get_config(UNUSED_ARG(PyObject* self), PyObject* args) { + PyObject* dict; + + if (!PyArg_ParseTuple(args, "")) + return NULL; + + dict = PyDict_New(); + if (dict == NULL) + return NULL; + + if (conf_enum_root(pyobj_config_make_dict, (void*)dict) != NULL) { + PyDict_Clear(dict); + PyErr_SetString(PyExc_Exception, "unable to iterate config"); + return NULL; + } + + return dict; +} + static PyMethodDef EmbMethods[] = { /* Communication methods */ {"dump", emb_dump, METH_VARARGS, "Dump raw P10 line to server"}, @@ -686,11 +844,12 @@ static PyMethodDef EmbMethods[] = { //TODO: {"channel_mode", emb_channel_mode, METH_VARARGS, "set modes on a channel"}, //TODO: {"user_mode", emb_user_mode, METH_VARARGS, "Have x3 set usermodes on one of its own nicks"}, // -//TODO: {"get_config", emb_get_config, METH_VARARGS, "get x3.conf settings into a nested dict"}, + {"get_config", emb_get_config, METH_VARARGS, "get x3.conf settings into a nested dict"}, //TODO: {"config_set", emb_config_set, METH_VARARGS, "change a config setting 'on-the-fly'."}, // -//TODO: {"timeq_add", emb_timeq_new, METH_VARARGS, "some kind of interface to the timed event system."}, -//TODO: {"timeq_del", emb_timeq_new, METH_VARARGS, "some kind of interface to the timed event system."}, + {"timeq_add", emb_timeq_add, METH_VARARGS, "add function to callback to the event system"}, + {"timeq_del", emb_timeq_del, METH_VARARGS, "remove function to callback from the event system"}, + /* Information gathering methods */ {"get_user", emb_get_user, METH_VARARGS, "Get details about a nickname"}, {"get_users", emb_get_users, METH_VARARGS, "Get all connected users"},