From abc369b0b572d864457a5efa58623f113df34438 Mon Sep 17 00:00:00 2001 From: Geo Date: Sat, 13 Feb 2021 10:49:51 -0500 Subject: [PATCH 01/71] first commit --- src/mod/python.mod/pymod.h | 4 + src/mod/python.mod/python.c | 356 ++++++++++++++++++++++++++++++++++++ src/mod/python.mod/python.h | 4 + 3 files changed, 364 insertions(+) create mode 100644 src/mod/python.mod/pymod.h create mode 100644 src/mod/python.mod/python.c create mode 100644 src/mod/python.mod/python.h diff --git a/src/mod/python.mod/pymod.h b/src/mod/python.mod/pymod.h new file mode 100644 index 000000000..5d3ae0fd5 --- /dev/null +++ b/src/mod/python.mod/pymod.h @@ -0,0 +1,4 @@ +#define APIDEF_METHOD(symbol) static PyObject * api_##symbol(PyObject *self, PyObject *args) +#define APIDEF_KWMETHOD(symbol) static PyObject * api_##symbol(PyObject *self, PyObject *args, PyObject *kw) + +#undef putserv diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c new file mode 100644 index 000000000..bd75f1896 --- /dev/null +++ b/src/mod/python.mod/python.c @@ -0,0 +1,356 @@ +/* + * twitch.c -- part of twitch.mod + * will cease to work. Buyer beware. + * + * Originally written by Geo April 2020 + */ + +/* + * Copyright (C) 2020 - 2021 Eggheads Development Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#define MODULE_NAME "python" +#define MAKING_TWITCH + +#include "src/mod/module.h" +#undef interp +#include +#include +#include "src/mod/irc.mod/irc.h" +#include "src/mod/server.mod/server.h" +#include "src/mod/python.mod/python.h" + + +#undef global +static Function *global = NULL, *irc_funcs = NULL; + +extern p_tcl_bind_list H_pubm; + +int runPython(); + + +/* Calculate the memory we keep allocated. + */ +static int python_expmem() +{ + int size = 0; + + Context; + return size; +} + +int py_pubm (char *nick, char *hand, char *host, char *chan, char *text) { + char arg[2048]; + + strlcpy(arg, "binds", sizeof arg); + strncat(arg, "on_pub", sizeof arg); + strncat(arg, nick, sizeof arg); + strncat(arg, hand, sizeof arg); + strncat(arg, host, sizeof arg); + strncat(arg, chan, sizeof arg); + strncat(arg, text, sizeof arg); + runPython(5, arg); +/* call "on_pub" in python */; + return 0; +} + +static PyObject* py_numargs(PyObject *self, PyObject *args) { + int numargs = 2; + + if(!PyArg_ParseTuple(args, "i:numargs", &numargs)) + return NULL; + return PyLong_FromLong(numargs); +} + +static PyObject* py_putserv(PyObject *self, PyObject *args) { + char *s = 0, *t = 0, *p; + + if(!PyArg_ParseTuple(args, "s|s", &s, &t)) { + return NULL; + } + +// BADARGS(2, 3, " text ?options?"); + +// if ((argc == 3) && strcasecmp(argv[2], "-next") && +// strcasecmp(argv[2], "-normal")) { +// Tcl_AppendResult(irp, "unknown putserv option: should be one of: ", +// "-normal -next", NULL); +// return TCL_ERROR; +// } + + p = strchr(s, '\n'); + if (p != NULL) + *p = 0; + p = strchr(s, '\r'); + if (p != NULL) + *p = 0; +// if (!strcasecmp(t, "-next")) +// dprintf(DP_SERVER_NEXT, "%s\n", s); +// else + dprintf(DP_SERVER, "%s\n", s); + return Py_None; +} + + +static PyMethodDef PyMethods[] = { + {"numargs", py_numargs, METH_VARARGS, "Return the number of arguments received by the process."}, + {"putserv", py_putserv, METH_VARARGS, "text ?options"}, + {NULL, NULL, 0, NULL} +}; + +static PyModuleDef PyModule = { + PyModuleDef_HEAD_INIT, "py", NULL, -1, PyMethods, + NULL, NULL, NULL, NULL +}; + +static PyObject* PyInit_py(void) { + return PyModule_Create(&PyModule); +} + + +static void init_python() { + wchar_t *program = Py_DecodeLocale("eggdrop", NULL); + + if (program == NULL) { + fprintf(stderr, "Python: Fatal error: This should never happen\n"); + fatal(1); + } + Py_SetProgramName(program); /* optional but recommended */ + PyImport_AppendInittab("py", &PyInit_py); + Py_Initialize(); + PyRun_SimpleString("import sys"); + PyRun_SimpleString("sys.path.append(\".\")"); + + return; +} + +static void kill_python() { + + if (Py_FinalizeEx() < 0) { + exit(120); + } + PyMem_RawFree("eggdrop"); + return; +} + +int runPython(int pyc, char *args) +{ + PyObject *pName, *pModule, *pFunc; + PyObject *pArgs, *pValue; + int i=0; + char *tok; + char script[256]; + char method[256]; + char *pyv[pyc]; + + tok = strtok(args, " "); + strlcpy(script, tok, sizeof script); + pName = PyUnicode_DecodeFSDefault(script); + /* Error checking of pName left out */ + pModule = PyImport_Import(pName); + Py_DECREF(pName); + + tok = strtok(NULL, " "); + strlcpy(method, tok, sizeof method); + while (tok !=NULL) { + pyv[i++] = tok; + tok = strtok(NULL, " "); + } +// PySys_SetArgv(pyc, pyv); + if (pModule != NULL) { + pFunc = PyObject_GetAttrString(pModule, method); + /* pFunc is a new reference */ + if (pFunc && PyCallable_Check(pFunc)) { + pArgs = PyTuple_New(pyc); + for (i = 2; i < pyc; ++i) { + pValue = PyLong_FromLong(atoi(pyv[i])); + if (!pValue) { + Py_DECREF(pArgs); + Py_DECREF(pModule); + fprintf(stderr, "Cannot convert argument\n"); + return 1; + } + /* pValue reference stolen here: */ + PyTuple_SetItem(pArgs, i, pValue); + } + pValue = PyObject_CallObject(pFunc, pArgs); + Py_DECREF(pArgs); + if (pValue != NULL) { + printf("Result of call: %ld\n", PyLong_AsLong(pValue)); + Py_DECREF(pValue); + } + else { + Py_DECREF(pFunc); + Py_DECREF(pModule); + PyErr_Print(); + fprintf(stderr,"Call failed\n"); + return 1; + } + } + else { + if (PyErr_Occurred()) + PyErr_Print(); + fprintf(stderr, "Cannot find function \"%s\"\n", pyv[2]); + } + Py_XDECREF(pFunc); + Py_DECREF(pModule); + } + else { + PyErr_Print(); + fprintf(stderr, "Failed to load \"%s\"\n", "pyv[1]"); + return 1; + } + if (Py_FinalizeEx() < 0) { + return 120; + } + return 0; +} + + +static void cmd_python(struct userrec *u, int idx, char *par) { + PyRun_SimpleString("import sys"); + PyRun_SimpleString("sys.path.append(\".\")"); + PyRun_SimpleString(par); + return; +} + +static void cmd_pysource(struct userrec *u, int idx, char *par) { +int i, pyc=-1; + + if (!par[0]) { + dprintf(idx, "Usage: pysource [args]\n"); + return; + } + for (i = 0; par[i] != '\0'; i++) { + if (par[i] == ' ') { + pyc++; + } + } + + runPython(pyc, par); + + return; +} + +/* A report on the module status. + * + * details is either 0 or 1: + * 0 - `.status' + * 1 - `.status all' or `.module twitch' + */ +static void python_report(int idx, int details) +{ + if (details) { + int size = python_expmem(); + + dprintf(idx, " Using %d byte%s of memory\n", size, + (size != 1) ? "s" : ""); + } +} + +static cmd_t mydcc[] = { + /* command flags function tcl-name */ + {"pysource", "", (IntFunc) cmd_pysource, NULL}, + {"python", "", (IntFunc) cmd_python, NULL}, + {NULL, NULL, NULL, NULL} /* Mark end. */ +}; + +static cmd_t mypy[] = { + {"*", "", py_pubm, "python:pubm"}, + {NULL, NULL, NULL, NULL} +}; + +/*static tcl_cmds mytcl[] = { + {"twcmd", tcl_twcmd}, + {"roomstate", tcl_roomstate}, + {"userstate", tcl_userstate}, + {"twitchmods", tcl_twitchmods}, + {"twitchvips", tcl_twitchvips}, + {"ismod", tcl_ismod}, + {"isvip", tcl_isvip}, + {NULL, NULL} +}; */ + +/* +static tcl_ints my_tcl_ints[] = { + {"keep-nick", &keepnick, STR_PROTECT}, + {NULL, NULL, 0} +}; */ + +/* +static tcl_strings my_tcl_strings[] = { + {"cap-request", cap_request, 55, STR_PROTECT}, + {NULL, NULL, 0, 0} +}; */ + +static char *python_close() +{ + Context; + kill_python(); + rem_builtins(H_dcc, mydcc); + rem_builtins(H_pubm, mypy); +// rem_tcl_commands(mytcl); +// rem_tcl_ints(my_tcl_ints); + module_undepend(MODULE_NAME); + return NULL; +} + +EXPORT_SCOPE char *python_start(); + +static Function python_table[] = { + (Function) python_start, + (Function) python_close, + (Function) python_expmem, + (Function) python_report +}; + +char *python_start(Function *global_funcs) +{ + /* Assign the core function table. After this point you use all normal + * functions defined in src/mod/modules.h + */ + global = global_funcs; + + Context; + /* Register the module. */ + module_register(MODULE_NAME, python_table, 0, 1); + + if (!module_depend(MODULE_NAME, "eggdrop", 109, 0)) { + module_undepend(MODULE_NAME); + return "This module requires Eggdrop 1.9.0 or later."; + } + if (!(irc_funcs = module_depend(MODULE_NAME, "irc", 1, 5))) { + module_undepend(MODULE_NAME); + return "This module requires irc module 1.5 or later."; + } +/* + if (!(server_funcs = module_depend(MODULE_NAME, "channels", 1, 1))) { + module_undepend(MODULE_NAME); + return "This module requires channels module 1.1 or later."; + } +*/ + + init_python(); + + /* Add command table to bind list */ + add_builtins(H_pubm, mypy); +// add_builtins(H_dcc, mydcc); +// add_tcl_commands(mytcl); +// add_tcl_ints(my_tcl_ints); +// add_tcl_strings(my_tcl_strings); + return NULL; +} diff --git a/src/mod/python.mod/python.h b/src/mod/python.mod/python.h new file mode 100644 index 000000000..a3c20f36a --- /dev/null +++ b/src/mod/python.mod/python.h @@ -0,0 +1,4 @@ +#define PY_SSIZE_T_CLEAN +#include +#define PY_OK 0 +#undef putserv From 039cc46897407824458336df77bb2d8b699c4a21 Mon Sep 17 00:00:00 2001 From: Geo Date: Sat, 13 Feb 2021 10:57:02 -0500 Subject: [PATCH 02/71] Makefile for now --- src/mod/python.mod/Makefile | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/mod/python.mod/Makefile diff --git a/src/mod/python.mod/Makefile b/src/mod/python.mod/Makefile new file mode 100644 index 000000000..601214a15 --- /dev/null +++ b/src/mod/python.mod/Makefile @@ -0,0 +1,40 @@ +# Makefile for src/mod/python.mod/ + +srcdir = . + + +doofus: + @echo "" && \ + echo "Let's try this from the right directory..." && \ + echo "" && \ + cd ../../../ && $(MAKE) + +static: ../python.o + +modules: ../../../python.$(MOD_EXT) + +../python.o: + $(CC) $(CFLAGS) $(CPPFLAGS) `python3-config --cflags --embed` `python3-config --embed --ldflags` -DMAKING_MODS -c $(srcdir)/python.c && mv -f python.o ../ + +../../../python.$(MOD_EXT): ../python.o + $(LD) $(CFLAGS) -o ../../../python.$(MOD_EXT) ../python.o `python3-config --cflags --embed` `python3-config --embed --ldflags` $(XLIBS) $(MODULE_XLIBS) && $(STRIP) ../../../python.$(MOD_EXT) + +depend: + $(CC) $(CFLAGS) -MM $(srcdir)/python.c -MT ../python.o > .depend + +clean: + @rm -f .depend *.o *.$(MOD_EXT) *~ + +distclean: clean + +#safety hash +../python.o: .././python.mod/python.c ../../../src/mod/module.h \ + ../../../src/main.h ../../../config.h ../../../eggint.h ../../../lush.h \ + ../../../src/lang.h ../../../src/eggdrop.h ../../../src/compat/in6.h \ + ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \ + ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \ + ../../../src/compat/compat.h ../../../src/compat/base64.h \ + ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \ + ../../../src/compat/gethostbyname2.h \ + ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \ + ../../../src/mod/modvals.h ../../../src/tandem.h From 5884daa9841f3b04ac1486ca2b8089e3db98f9af Mon Sep 17 00:00:00 2001 From: Geo Date: Thu, 18 Feb 2021 01:18:23 -0500 Subject: [PATCH 03/71] more --- src/mod/python.mod/python.c | 40 +++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index bd75f1896..3fc0e2075 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -38,7 +38,7 @@ #undef global static Function *global = NULL, *irc_funcs = NULL; -extern p_tcl_bind_list H_pubm; +//extern p_tcl_bind_list H_pubm; int runPython(); @@ -56,14 +56,18 @@ static int python_expmem() int py_pubm (char *nick, char *hand, char *host, char *chan, char *text) { char arg[2048]; - strlcpy(arg, "binds", sizeof arg); - strncat(arg, "on_pub", sizeof arg); - strncat(arg, nick, sizeof arg); - strncat(arg, hand, sizeof arg); - strncat(arg, host, sizeof arg); - strncat(arg, chan, sizeof arg); - strncat(arg, text, sizeof arg); - runPython(5, arg); + strlcpy(arg, "binds ", sizeof arg); + strncat(arg, "on_pub ", sizeof arg - strlen(arg)); + strncat(arg, nick, sizeof arg - strlen(arg)); + strncat(arg, " ", sizeof arg - strlen(arg)); + strncat(arg, host, sizeof arg - strlen(arg)); + strncat(arg, " ", sizeof arg - strlen(arg)); + strncat(arg, hand, sizeof arg - strlen(arg)); + strncat(arg, " ", sizeof arg - strlen(arg)); + strncat(arg, chan, sizeof arg - strlen(arg)); + strncat(arg, " ", sizeof arg - strlen(arg)); + strncat(arg, text, sizeof arg - strlen(arg)); + runPython(7, arg); /* call "on_pub" in python */; return 0; } @@ -167,17 +171,19 @@ int runPython(int pyc, char *args) tok = strtok(NULL, " "); strlcpy(method, tok, sizeof method); while (tok !=NULL) { - pyv[i++] = tok; + pyv[i] = tok; tok = strtok(NULL, " "); +fprintf(stderr, "pyv[%d] is %s\n", i, pyv[i]); + i++; } -// PySys_SetArgv(pyc, pyv); if (pModule != NULL) { pFunc = PyObject_GetAttrString(pModule, method); /* pFunc is a new reference */ if (pFunc && PyCallable_Check(pFunc)) { - pArgs = PyTuple_New(pyc); - for (i = 2; i < pyc; ++i) { - pValue = PyLong_FromLong(atoi(pyv[i])); + pArgs = PyTuple_New(pyc-2); + for (i = 0; i < pyc-2; ++i) { + pValue = Py_BuildValue("s", pyv[i+1]); +fprintf(stderr, "i is %d, Adding %s\n", i, pyv[i+1]); if (!pValue) { Py_DECREF(pArgs); Py_DECREF(pModule); @@ -204,14 +210,14 @@ int runPython(int pyc, char *args) else { if (PyErr_Occurred()) PyErr_Print(); - fprintf(stderr, "Cannot find function \"%s\"\n", pyv[2]); + fprintf(stderr, "Cannot find function \"%s\"\n", method); } Py_XDECREF(pFunc); Py_DECREF(pModule); } else { PyErr_Print(); - fprintf(stderr, "Failed to load \"%s\"\n", "pyv[1]"); + fprintf(stderr, "Failed to load \"%s\"\n", pyv[0]); return 1; } if (Py_FinalizeEx() < 0) { @@ -348,7 +354,7 @@ char *python_start(Function *global_funcs) /* Add command table to bind list */ add_builtins(H_pubm, mypy); -// add_builtins(H_dcc, mydcc); + add_builtins(H_dcc, mydcc); // add_tcl_commands(mytcl); // add_tcl_ints(my_tcl_ints); // add_tcl_strings(my_tcl_strings); From abe4eede075d89d7133bde7ebd2b86ea36bc5aaf Mon Sep 17 00:00:00 2001 From: Geo Date: Fri, 19 Feb 2021 23:15:16 -0500 Subject: [PATCH 04/71] moar --- binds.py | 55 +++++++++++++++++++++++++++++++++++++ src/mod/python.mod/python.c | 30 ++++++++++++++++---- 2 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 binds.py diff --git a/binds.py b/binds.py new file mode 100644 index 000000000..c05e5e81f --- /dev/null +++ b/binds.py @@ -0,0 +1,55 @@ +#import py + + +class Eggdrop: + def __init__(self, binds): + self.binds = binds + +class Binds: + def __init__(self): + self.bindlist = {"msgm": {}, "pubm": {}} + + def list(self, mask=None): + if not mask: + print(self.bindlist) + else: + for i in self.bindlist[mask]: + print(self.bindlist[mask][i]) + return + + def add(self, bindtype, cmd, callback): + self.bindlist[bindtype][cmd] = callback + return + +my_binds = Binds() +eggdrop = Eggdrop(binds=my_binds) + + +def myfunc(nick, user, hand, chan, text): + print("Holy shit this worked- "+nick+" on "+chan+" said "+text) + return + +def on_pubm(nick, user, hand, chan, text): + global eggdrop + print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) + for i in eggdrop.binds.bindlist["pubm"]: + eggdrop.binds.bindlist["pubm"][i](nick, user, hand, chan, text) + return + +def on_msgm(nick, user, hand, text): + print("msgm bind triggered with "+" ".join([nick, user, hand, chan, text])) + return + +### add, delete, list + +def on_event(bindtype, *args): + for arg in args: + print(arg) + if bindtype == "pubm": + on_pubm(*args) + elif bindtype == "msgm": + on_msgm(*args) +# py.putserv("PRIVMSG :"+chan+" you are "+nick+" and you said "+text) + return 0 + +eggdrop.binds.add("pubm", "!hi", myfunc) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 3fc0e2075..776e0a3e7 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -57,7 +57,8 @@ int py_pubm (char *nick, char *hand, char *host, char *chan, char *text) { char arg[2048]; strlcpy(arg, "binds ", sizeof arg); - strncat(arg, "on_pub ", sizeof arg - strlen(arg)); + strncat(arg, "on_event ", sizeof arg - strlen(arg)); + strncat(arg, "pubm ", sizeof arg - strlen(arg)); strncat(arg, nick, sizeof arg - strlen(arg)); strncat(arg, " ", sizeof arg - strlen(arg)); strncat(arg, host, sizeof arg - strlen(arg)); @@ -67,11 +68,28 @@ int py_pubm (char *nick, char *hand, char *host, char *chan, char *text) { strncat(arg, chan, sizeof arg - strlen(arg)); strncat(arg, " ", sizeof arg - strlen(arg)); strncat(arg, text, sizeof arg - strlen(arg)); + runPython(8, arg); + return 0; +} + +int py_msgm (char *nick, char *hand, char *host, char *text) { + char arg[2048]; + + strlcpy(arg, "binds ", sizeof arg); + strncat(arg, "on_event ", sizeof arg - strlen(arg)); + strncat(arg, "msgm ", sizeof arg - strlen(arg)); + strncat(arg, nick, sizeof arg - strlen(arg)); + strncat(arg, " ", sizeof arg - strlen(arg)); + strncat(arg, host, sizeof arg - strlen(arg)); + strncat(arg, " ", sizeof arg - strlen(arg)); + strncat(arg, hand, sizeof arg - strlen(arg)); + strncat(arg, " ", sizeof arg - strlen(arg)); + strncat(arg, text, sizeof arg - strlen(arg)); runPython(7, arg); -/* call "on_pub" in python */; return 0; } + static PyObject* py_numargs(PyObject *self, PyObject *args) { int numargs = 2; @@ -275,8 +293,8 @@ static cmd_t mydcc[] = { {NULL, NULL, NULL, NULL} /* Mark end. */ }; -static cmd_t mypy[] = { - {"*", "", py_pubm, "python:pubm"}, +static cmd_t mypy_pubm[] = { + {"*", "", py_pubm, "python:pubm"}, {NULL, NULL, NULL, NULL} }; @@ -308,7 +326,7 @@ static char *python_close() Context; kill_python(); rem_builtins(H_dcc, mydcc); - rem_builtins(H_pubm, mypy); + rem_builtins(H_pubm, mypy_pubm); // rem_tcl_commands(mytcl); // rem_tcl_ints(my_tcl_ints); module_undepend(MODULE_NAME); @@ -353,7 +371,7 @@ char *python_start(Function *global_funcs) init_python(); /* Add command table to bind list */ - add_builtins(H_pubm, mypy); + add_builtins(H_pubm, mypy_pubm); add_builtins(H_dcc, mydcc); // add_tcl_commands(mytcl); // add_tcl_ints(my_tcl_ints); From eca223948a2699054bb2aa9de4f692afd3430911 Mon Sep 17 00:00:00 2001 From: Geo Date: Mon, 22 Feb 2021 00:43:54 -0500 Subject: [PATCH 05/71] file structure start --- eggdroppy/__init__.py | 3 ++ eggdroppy/eggdrop/__init__.py | 1 + eggdroppy/eggdrop/binds.py | 77 ++++++++++++++++++++++++++++++++++ eggdroppy/myscript/__init__.py | 7 ++++ eggdroppy/myscript/myscript.py | 6 +++ 5 files changed, 94 insertions(+) create mode 100644 eggdroppy/__init__.py create mode 100644 eggdroppy/eggdrop/__init__.py create mode 100644 eggdroppy/eggdrop/binds.py create mode 100644 eggdroppy/myscript/__init__.py create mode 100644 eggdroppy/myscript/myscript.py diff --git a/eggdroppy/__init__.py b/eggdroppy/__init__.py new file mode 100644 index 000000000..44b1beacf --- /dev/null +++ b/eggdroppy/__init__.py @@ -0,0 +1,3 @@ +#from .eggdrop.binds import * +from eggdroppy import * +from .myscript import * diff --git a/eggdroppy/eggdrop/__init__.py b/eggdroppy/eggdrop/__init__.py new file mode 100644 index 000000000..e24668768 --- /dev/null +++ b/eggdroppy/eggdrop/__init__.py @@ -0,0 +1 @@ +# this thing diff --git a/eggdroppy/eggdrop/binds.py b/eggdroppy/eggdrop/binds.py new file mode 100644 index 000000000..6bddaa99c --- /dev/null +++ b/eggdroppy/eggdrop/binds.py @@ -0,0 +1,77 @@ +#import py +import re + + +class Eggdrop: + def __init__(self, binds): + self.binds = binds + +class Binds: + def __init__(self): + self.bindlist = {"msgm": {}, "pubm": {}} + + def list(self, mask=None): + if not mask: + print(self.bindlist) + else: + for i in self.bindlist[mask]: + print(self.bindlist[mask][i]) + return + + def add(self, bindtype, cmd, flags, mask, callback): + self.bindlist[bindtype][cmd]={} + self.bindlist[bindtype][cmd]["callback"] = callback + self.bindlist[bindtype][cmd]["mask"] = mask + self.bindlist[bindtype][cmd]["flags"] = flags + return + +my_binds = Binds() +eggdrop = Eggdrop(binds=my_binds) + +import re + +def bindmask2re(mask): + r = '' + for c in mask: + if c == '?': + r += '.' + elif c == '*': + r += '.*' + elif c == '%': + r += '\S*' + elif c == '~': + r += '\s+' + else: + r += re.escape(c) + return re.compile('^' + r + '$') + + +def myfunc(nick, user, hand, chan, text): + print("Holy shit this worked- "+nick+" on "+chan+" said "+text) + return + +def on_pubm(nick, user, hand, chan, text): + print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) + for i in eggdrop.binds.bindlist["pubm"]: + print("mask is "+eggdrop.binds.bindlist["pubm"][i]["mask"]) + eggdrop.binds.bindlist["pubm"][i]["callback"](nick, user, hand, chan, text) + return + +def on_msgm(nick, user, hand, text): + print("msgm bind triggered with "+" ".join([nick, user, hand, text])) + for i in eggdrop.binds.bindlist["pubm"]: + print("mask is "+eggdrop.binds.bindlist["msgm"][i]["mask"]) + eggdrop.binds.bindlist["msgm"][i]["callback"](nick, user, hand, text) + return + +def on_event(bindtype, *args): + for arg in args: + print(arg) + if bindtype == "pubm": + on_pubm(*args) + elif bindtype == "msgm": + on_msgm(*args) +# py.putserv("PRIVMSG :"+chan+" you are "+nick+" and you said "+text) + return 0 + +eggdrop.binds.add("pubm", "!hi", "o|o", "*!*@*", myfunc) diff --git a/eggdroppy/myscript/__init__.py b/eggdroppy/myscript/__init__.py new file mode 100644 index 000000000..17ee0edc3 --- /dev/null +++ b/eggdroppy/myscript/__init__.py @@ -0,0 +1,7 @@ +#from ..eggdrop.binds import * +#from ..eggdrop import binds +#from .myscript import * +from .myscript import * + +#eggdrop.binds.add("pubm", "!moo", "*", "*", mypub) +#print("Loaded this") diff --git a/eggdroppy/myscript/myscript.py b/eggdroppy/myscript/myscript.py new file mode 100644 index 000000000..3712c9085 --- /dev/null +++ b/eggdroppy/myscript/myscript.py @@ -0,0 +1,6 @@ +def mypub(nick, user, hand, chan, text): + print("!!! "+nick+"+ on "+chan+" said "+text) + return + +#eggdroppy.binds.add("pubm", "!moo", "*", "*", mypub) +print("Loaded this") From 551050cbffa2afef9b177040cbd5fc3b0f5526a5 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Tue, 23 Feb 2021 08:59:12 +0100 Subject: [PATCH 06/71] Python exports from C, new .pyexpr command --- eggdroppy/binds/__init__.py | 1 + eggdroppy/{eggdrop => binds}/binds.py | 40 ++++ eggdroppy/eggdrop/__init__.py | 1 - src/mod/python.mod/python.c | 284 +++++++++++++++----------- 4 files changed, 209 insertions(+), 117 deletions(-) create mode 100644 eggdroppy/binds/__init__.py rename eggdroppy/{eggdrop => binds}/binds.py (61%) delete mode 100644 eggdroppy/eggdrop/__init__.py diff --git a/eggdroppy/binds/__init__.py b/eggdroppy/binds/__init__.py new file mode 100644 index 000000000..622d7222b --- /dev/null +++ b/eggdroppy/binds/__init__.py @@ -0,0 +1 @@ +__all__ = ["binds"] diff --git a/eggdroppy/eggdrop/binds.py b/eggdroppy/binds/binds.py similarity index 61% rename from eggdroppy/eggdrop/binds.py rename to eggdroppy/binds/binds.py index 6bddaa99c..49ef3c53e 100644 --- a/eggdroppy/eggdrop/binds.py +++ b/eggdroppy/binds/binds.py @@ -1,6 +1,46 @@ #import py import re +from enum import IntFlag +import eggdrop +class UserFlags(IntFlag): + autoop = eggdrop.USER_AUTOOP + bot = eggdrop.USER_BOT + common = eggdrop.USER_COMMON + deop = eggdrop.USER_DEOP + exempt = eggdrop.USER_EXEMPT + friend = eggdrop.USER_FRIEND + autovoice = eggdrop.USER_GVOICE + highlight = eggdrop.USER_HIGHLITE + janitor = eggdrop.USER_JANITOR + autokick = eggdrop.USER_KICK + halfop = eggdrop.USER_HALFOP + master = eggdrop.USER_MASTER + owner = eggdrop.USER_OWNER + op = eggdrop.USER_OP + partyline = eggdrop.USER_PARTY + devoice = eggdrop.USER_QUIET + dehalfop = eggdrop.USER_DEHALFOP + botnetmaster = eggdrop.USER_BOTMAST + unshared = eggdrop.USER_UNSHARED + voice = eggdrop.USER_VOICE + wasoptest = eggdrop.USER_WASOPTEST + xfer = eggdrop.USER_XFER + autohalfop = eggdrop.USER_AUTOHALFOP + washalfoptest = eggdrop.USER_WASHALFOPTEST + +class FlagMatcher(Object): + def __init__(self, globalflags=None, chanflags=None, requireall=False): + self.globalflags = globalflags + self.chanflags = chanflags + self.requireall = requireall + + def match(self, globalflags, chanflags): + if self.globalflags is not None: + mg = self.globalflags & globalflags + if self.chanflags is not None: + mc = self.chanflags & chanflags + class Eggdrop: def __init__(self, binds): diff --git a/eggdroppy/eggdrop/__init__.py b/eggdroppy/eggdrop/__init__.py deleted file mode 100644 index e24668768..000000000 --- a/eggdroppy/eggdrop/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# this thing diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 776e0a3e7..8214f0e7d 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -24,7 +24,9 @@ */ #define MODULE_NAME "python" -#define MAKING_TWITCH +#define MAKING_PYTHON + +#define ARRAYCOUNT(x) (sizeof (x) / sizeof *(x)) #include "src/mod/module.h" #undef interp @@ -38,9 +40,12 @@ #undef global static Function *global = NULL, *irc_funcs = NULL; +static PyObject *pymodobj; +static PyObject *pirp, *pglobals; + //extern p_tcl_bind_list H_pubm; -int runPython(); +int runPythonArgs(const char *script, const char *method, int argc, char **argv); /* Calculate the memory we keep allocated. @@ -54,38 +59,18 @@ static int python_expmem() } int py_pubm (char *nick, char *hand, char *host, char *chan, char *text) { - char arg[2048]; - - strlcpy(arg, "binds ", sizeof arg); - strncat(arg, "on_event ", sizeof arg - strlen(arg)); - strncat(arg, "pubm ", sizeof arg - strlen(arg)); - strncat(arg, nick, sizeof arg - strlen(arg)); - strncat(arg, " ", sizeof arg - strlen(arg)); - strncat(arg, host, sizeof arg - strlen(arg)); - strncat(arg, " ", sizeof arg - strlen(arg)); - strncat(arg, hand, sizeof arg - strlen(arg)); - strncat(arg, " ", sizeof arg - strlen(arg)); - strncat(arg, chan, sizeof arg - strlen(arg)); - strncat(arg, " ", sizeof arg - strlen(arg)); - strncat(arg, text, sizeof arg - strlen(arg)); - runPython(8, arg); + struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL, 0, 0, 0, 0, 0 }; + char *argv[] = {"pubm", nick, host, hand, chan, text}; + + runPythonArgs("binds", "on_event", ARRAYCOUNT(argv), argv); return 0; } int py_msgm (char *nick, char *hand, char *host, char *text) { - char arg[2048]; - - strlcpy(arg, "binds ", sizeof arg); - strncat(arg, "on_event ", sizeof arg - strlen(arg)); - strncat(arg, "msgm ", sizeof arg - strlen(arg)); - strncat(arg, nick, sizeof arg - strlen(arg)); - strncat(arg, " ", sizeof arg - strlen(arg)); - strncat(arg, host, sizeof arg - strlen(arg)); - strncat(arg, " ", sizeof arg - strlen(arg)); - strncat(arg, hand, sizeof arg - strlen(arg)); - strncat(arg, " ", sizeof arg - strlen(arg)); - strncat(arg, text, sizeof arg - strlen(arg)); - runPython(7, arg); + struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL, 0, 0, 0, 0, 0 }; + char *argv[] = {"msgm", nick, host, hand, text}; + + runPythonArgs("binds", "on_event", ARRAYCOUNT(argv), argv); return 0; } @@ -129,18 +114,45 @@ static PyObject* py_putserv(PyObject *self, PyObject *args) { static PyMethodDef PyMethods[] = { - {"numargs", py_numargs, METH_VARARGS, "Return the number of arguments received by the process."}, - {"putserv", py_putserv, METH_VARARGS, "text ?options"}, - {NULL, NULL, 0, NULL} + {"numargs", py_numargs, METH_VARARGS, "Return the number of arguments received by the process."}, + {"putserv", py_putserv, METH_VARARGS, "text ?options"}, + {NULL, NULL, 0, NULL} }; static PyModuleDef PyModule = { - PyModuleDef_HEAD_INIT, "py", NULL, -1, PyMethods, - NULL, NULL, NULL, NULL + PyModuleDef_HEAD_INIT, "eggdrop", NULL, -1, PyMethods, + NULL, NULL, NULL, NULL }; static PyObject* PyInit_py(void) { - return PyModule_Create(&PyModule); + pymodobj = PyModule_Create(&PyModule); + + PyModule_AddIntConstant(pymodobj, "USER_AUTOOP", 0x00000001); + PyModule_AddIntConstant(pymodobj, "USER_BOT", 0x00000002); + PyModule_AddIntConstant(pymodobj, "USER_COMMON", 0x00000004); + PyModule_AddIntConstant(pymodobj, "USER_DEOP", 0x00000008); + PyModule_AddIntConstant(pymodobj, "USER_EXEMPT", 0x00000010); + PyModule_AddIntConstant(pymodobj, "USER_FRIEND", 0x00000020); + PyModule_AddIntConstant(pymodobj, "USER_GVOICE", 0x00000040); + PyModule_AddIntConstant(pymodobj, "USER_HIGHLITE", 0x00000080); + PyModule_AddIntConstant(pymodobj, "USER_JANITOR", 0x00000200); + PyModule_AddIntConstant(pymodobj, "USER_KICK", 0x00000400); + PyModule_AddIntConstant(pymodobj, "USER_HALFOP", 0x00000800); + PyModule_AddIntConstant(pymodobj, "USER_MASTER", 0x00001000); + PyModule_AddIntConstant(pymodobj, "USER_OWNER", 0x00002000); + PyModule_AddIntConstant(pymodobj, "USER_OP", 0x00004000); + PyModule_AddIntConstant(pymodobj, "USER_PARTY", 0x00008000); + PyModule_AddIntConstant(pymodobj, "USER_QUIET", 0x00010000); + PyModule_AddIntConstant(pymodobj, "USER_DEHALFOP", 0x00020000); + PyModule_AddIntConstant(pymodobj, "USER_BOTMAST", 0x00080000); + PyModule_AddIntConstant(pymodobj, "USER_UNSHARED", 0x00100000); + PyModule_AddIntConstant(pymodobj, "USER_VOICE", 0x00200000); + PyModule_AddIntConstant(pymodobj, "USER_WASOPTEST", 0x00400000); + PyModule_AddIntConstant(pymodobj, "USER_XFER", 0x00800000); + PyModule_AddIntConstant(pymodobj, "USER_AUTOHALFOP", 0x01000000); + PyModule_AddIntConstant(pymodobj, "USER_WASHALFOPTEST", 0x02000000); + + return pymodobj; } @@ -152,8 +164,12 @@ static void init_python() { fatal(1); } Py_SetProgramName(program); /* optional but recommended */ - PyImport_AppendInittab("py", &PyInit_py); + PyImport_AppendInittab("eggdrop", &PyInit_py); Py_Initialize(); + + pirp = PyImport_AddModule("__main__"); + pglobals = PyModule_GetDict(pirp); + PyRun_SimpleString("import sys"); PyRun_SimpleString("sys.path.append(\".\")"); @@ -161,7 +177,6 @@ static void init_python() { } static void kill_python() { - if (Py_FinalizeEx() < 0) { exit(120); } @@ -169,103 +184,139 @@ static void kill_python() { return; } -int runPython(int pyc, char *args) +int runPythonArgs(const char *script, const char *method, int argc, char **argv) { - PyObject *pName, *pModule, *pFunc; - PyObject *pArgs, *pValue; - int i=0; - char *tok; - char script[256]; - char method[256]; - char *pyv[pyc]; - - tok = strtok(args, " "); - strlcpy(script, tok, sizeof script); - pName = PyUnicode_DecodeFSDefault(script); - /* Error checking of pName left out */ - pModule = PyImport_Import(pName); - Py_DECREF(pName); - - tok = strtok(NULL, " "); - strlcpy(method, tok, sizeof method); - while (tok !=NULL) { - pyv[i] = tok; - tok = strtok(NULL, " "); -fprintf(stderr, "pyv[%d] is %s\n", i, pyv[i]); - i++; - } - if (pModule != NULL) { - pFunc = PyObject_GetAttrString(pModule, method); - /* pFunc is a new reference */ - if (pFunc && PyCallable_Check(pFunc)) { - pArgs = PyTuple_New(pyc-2); - for (i = 0; i < pyc-2; ++i) { - pValue = Py_BuildValue("s", pyv[i+1]); -fprintf(stderr, "i is %d, Adding %s\n", i, pyv[i+1]); - if (!pValue) { - Py_DECREF(pArgs); - Py_DECREF(pModule); - fprintf(stderr, "Cannot convert argument\n"); - return 1; - } - /* pValue reference stolen here: */ - PyTuple_SetItem(pArgs, i, pValue); - } - pValue = PyObject_CallObject(pFunc, pArgs); + PyObject *pName, *pModule, *pFunc; + PyObject *pArgs, *pValue; + char *pyv[argc]; + + pName = PyUnicode_DecodeFSDefault(script); + /* Error checking of pName left out */ + pModule = PyImport_Import(pName); + Py_DECREF(pName); + + for (int i = 0; i < argc; i++) { + fprintf(stderr, "pyv[%d] is %s\n", i, argv[i]); + } + if (pModule != NULL) { + pFunc = PyObject_GetAttrString(pModule, method); + /* pFunc is a new reference */ + if (pFunc && PyCallable_Check(pFunc)) { + pArgs = PyTuple_New(argc); + for (int i = 0; i < argc; i++) { + pValue = Py_BuildValue("s", argv[i]); + if (!pValue) { Py_DECREF(pArgs); - if (pValue != NULL) { - printf("Result of call: %ld\n", PyLong_AsLong(pValue)); - Py_DECREF(pValue); - } - else { - Py_DECREF(pFunc); - Py_DECREF(pModule); - PyErr_Print(); - fprintf(stderr,"Call failed\n"); - return 1; - } - } - else { - if (PyErr_Occurred()) - PyErr_Print(); - fprintf(stderr, "Cannot find function \"%s\"\n", method); - } - Py_XDECREF(pFunc); + Py_DECREF(pModule); + fprintf(stderr, "Cannot convert argument at position %d: '%s'\n", i, argv[i]); + return 1; + } + /* pValue reference stolen here: */ + PyTuple_SetItem(pArgs, i, pValue); + } + pValue = PyObject_CallObject(pFunc, pArgs); + Py_DECREF(pArgs); + if (pValue != NULL) { + printf("Result of call: %ld\n", PyLong_AsLong(pValue)); + Py_DECREF(pValue); + } + else { + Py_DECREF(pFunc); Py_DECREF(pModule); - } - else { PyErr_Print(); - fprintf(stderr, "Failed to load \"%s\"\n", pyv[0]); + fprintf(stderr,"Call failed\n"); return 1; + } } - if (Py_FinalizeEx() < 0) { - return 120; + else { + if (PyErr_Occurred()) + PyErr_Print(); + fprintf(stderr, "Cannot find function \"%s\"\n", method); } - return 0; + Py_XDECREF(pFunc); + Py_DECREF(pModule); + } + else { + PyErr_Print(); + fprintf(stderr, "Failed to load \"%s\"\n", pyv[0]); + return 1; + } + if (Py_FinalizeEx() < 0) { + return 120; + } + return 0; } +static void runPython(char *par) { + int maxargc = 16; + char **argv = NULL; + char *script = NULL, *method = NULL; + int argvidx = -2; + char *word; + + if (!argv) { + argv = nmalloc(maxargc * sizeof *argv); + } + for (word = strtok(par, " "); word; word = strtok(NULL, " ")) { + if (argvidx == -2) { + script = word; + } else if (argvidx == -1) { + method = word; + } else { + if (argvidx >= maxargc) { + maxargc += 16; + argv = nrealloc(argv, maxargc * sizeof *argv); + } + argv[argvidx] = word; + } + argvidx++; + } + if (argvidx < 0) { + fprintf(stderr, "Missing script/method for runPython\n"); + return; + } + runPythonArgs(script, method, argvidx, argv); +} static void cmd_python(struct userrec *u, int idx, char *par) { - PyRun_SimpleString("import sys"); - PyRun_SimpleString("sys.path.append(\".\")"); - PyRun_SimpleString(par); + char *result; + PyObject *pobj, *pstr; + + PyErr_Clear(); + + pobj = PyRun_String(par, Py_file_input, pglobals, pglobals); + + if (PyErr_Occurred()) { + PyErr_Print(); + } return; } -static void cmd_pysource(struct userrec *u, int idx, char *par) { -int i, pyc=-1; +static void cmd_pyexpr(struct userrec *u, int idx, char *par) { + char *result; + PyObject *pobj, *pstr; + + PyErr_Clear(); + + pobj = PyRun_String(par, Py_eval_input, pglobals, pglobals); + if (pobj) { + pstr = PyObject_Str(pobj); + + dprintf(idx, "%s\n", PyUnicode_AsUTF8(pstr)); + Py_DECREF(pstr); + Py_DECREF(pobj); + } else if (PyErr_Occurred()) { + PyErr_Print(); + } + return; +} +static void cmd_pysource(struct userrec *u, int idx, char *par) { if (!par[0]) { dprintf(idx, "Usage: pysource [args]\n"); return; } - for (i = 0; par[i] != '\0'; i++) { - if (par[i] == ' ') { - pyc++; - } - } - - runPython(pyc, par); + runPython(par); return; } @@ -290,6 +341,7 @@ static cmd_t mydcc[] = { /* command flags function tcl-name */ {"pysource", "", (IntFunc) cmd_pysource, NULL}, {"python", "", (IntFunc) cmd_python, NULL}, + {"pyexpr", "", (IntFunc) cmd_pyexpr, NULL}, {NULL, NULL, NULL, NULL} /* Mark end. */ }; From 5f5b6cf2afca05828d922f6b1d84aca06be088a9 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 14 Mar 2021 17:11:09 +0100 Subject: [PATCH 07/71] Added flagmatching in Python --- eggdroppy/binds/binds.py | 126 +++++++++++++++++++++++++----------- src/mod/python.mod/python.c | 70 ++++++++++++-------- 2 files changed, 130 insertions(+), 66 deletions(-) diff --git a/eggdroppy/binds/binds.py b/eggdroppy/binds/binds.py index 49ef3c53e..39e4911cc 100644 --- a/eggdroppy/binds/binds.py +++ b/eggdroppy/binds/binds.py @@ -1,45 +1,87 @@ -#import py import re from enum import IntFlag import eggdrop +from pprint import pprint class UserFlags(IntFlag): - autoop = eggdrop.USER_AUTOOP - bot = eggdrop.USER_BOT - common = eggdrop.USER_COMMON - deop = eggdrop.USER_DEOP - exempt = eggdrop.USER_EXEMPT - friend = eggdrop.USER_FRIEND - autovoice = eggdrop.USER_GVOICE - highlight = eggdrop.USER_HIGHLITE - janitor = eggdrop.USER_JANITOR - autokick = eggdrop.USER_KICK - halfop = eggdrop.USER_HALFOP - master = eggdrop.USER_MASTER - owner = eggdrop.USER_OWNER - op = eggdrop.USER_OP - partyline = eggdrop.USER_PARTY - devoice = eggdrop.USER_QUIET - dehalfop = eggdrop.USER_DEHALFOP - botnetmaster = eggdrop.USER_BOTMAST - unshared = eggdrop.USER_UNSHARED - voice = eggdrop.USER_VOICE - wasoptest = eggdrop.USER_WASOPTEST - xfer = eggdrop.USER_XFER - autohalfop = eggdrop.USER_AUTOHALFOP - washalfoptest = eggdrop.USER_WASHALFOPTEST - -class FlagMatcher(Object): - def __init__(self, globalflags=None, chanflags=None, requireall=False): + autoop = a = eggdrop.USER_AUTOOP + bot = b = eggdrop.USER_BOT + common = c = eggdrop.USER_COMMON + deop = d = eggdrop.USER_DEOP + exempt = e = eggdrop.USER_EXEMPT + friend = f = eggdrop.USER_FRIEND + autovoice = g = eggdrop.USER_GVOICE + highlight = h = eggdrop.USER_HIGHLITE + janitor = j = eggdrop.USER_JANITOR + autokick = k = eggdrop.USER_KICK + halfop = l = eggdrop.USER_HALFOP + master = m = eggdrop.USER_MASTER + owner = n = eggdrop.USER_OWNER + op = o = eggdrop.USER_OP + partyline = p = eggdrop.USER_PARTY + devoice = q = eggdrop.USER_QUIET + dehalfop = r = eggdrop.USER_DEHALFOP + botnetmaster = t = eggdrop.USER_BOTMAST + unshared = u = eggdrop.USER_UNSHARED + voice = v = eggdrop.USER_VOICE + wasoptest = w = eggdrop.USER_WASOPTEST + xfer = x = eggdrop.USER_XFER + autohalfop = y = eggdrop.USER_AUTOHALFOP + washalfoptest = z = eggdrop.USER_WASHALFOPTEST + +class FlagRecord: + def __init__(self, globalflags=None, chanflags=None, botflags=None): + self.globl = UserFlags(globalflags) + self.chan = UserFlags(chanflags) + self.bot = UserFlags(botflags) + + def __str__(self): + return 'globl: {}, chan: {}, bot: {}'.format(str(self.globl), str(self.chan), str(self.bot)) + + def __repr__(self): + return repr({'global': repr(self.globl), 'chan': repr(self.chan), 'bot': repr(self.bot)}) + +class FlagMatcher: + def __init__(self, globalflags=None, globalnegflags=None, chanflags=None, channegflags=None, botflags=None, botnegflags=None, requireall=False): self.globalflags = globalflags + self.globalnegflags = globalnegflags self.chanflags = chanflags + self.channegflags = channegflags + self.botflags = botflags + self.botnegflags = botnegflags self.requireall = requireall - def match(self, globalflags, chanflags): - if self.globalflags is not None: - mg = self.globalflags & globalflags - if self.chanflags is not None: - mc = self.chanflags & chanflags + @staticmethod + def flagcheck(posflags, negflags, requireall, flags): + if not requireall: + if posflags and not posflags & flags: + return False + else: + if posflags and not posflags & flags == posflags: + return False + if negflags and negflags & flags: + return False + return True + + def match(self, flags : FlagRecord): + if not FlagMatcher.flagcheck(self.globalflags, self.globalnegflags, self.requireall, flags.globl): + return False + if not FlagMatcher.flagcheck(self.chanflags, self.channegflags, self.requireall, flags.chan): + return False + if not FlagMatcher.flagcheck(self.botflags, self.botnegflags, self.requireall, flags.bot): + return False + return True + + def __repr__(self): + return repr({ + 'globalmatch': repr(self.globalflags), + 'globalnegmatch': repr(self.globalnegflags), + 'chanmatch': repr(self.chanflags), + 'channegmatch': repr(self.channegflags), + 'botmatch': repr(self.botflags), + 'botnegmatch': repr(self.botnegflags), + 'requireall': repr(self.requireall) + }) class Eggdrop: @@ -90,11 +132,16 @@ def myfunc(nick, user, hand, chan, text): print("Holy shit this worked- "+nick+" on "+chan+" said "+text) return -def on_pubm(nick, user, hand, chan, text): +def on_pubm(flags, nick, user, hand, chan, text): + pprint(flags) print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) for i in eggdrop.binds.bindlist["pubm"]: print("mask is "+eggdrop.binds.bindlist["pubm"][i]["mask"]) - eggdrop.binds.bindlist["pubm"][i]["callback"](nick, user, hand, chan, text) + if eggdrop.binds.bindlist["pubm"][i]["flags"].match(flags): + print("flagmatcher {} matches flag record {}".format(repr(eggdrop.binds.bindlist["pubm"][i]["flags"]), repr(flags))) + eggdrop.binds.bindlist["pubm"][i]["callback"](nick, user, hand, chan, text) + else: + print("flagmatcher {} does not match flag record {}".format(repr(eggdrop.binds.bindlist["pubm"][i]["flags"]), repr(flags))) return def on_msgm(nick, user, hand, text): @@ -104,14 +151,15 @@ def on_msgm(nick, user, hand, text): eggdrop.binds.bindlist["msgm"][i]["callback"](nick, user, hand, text) return -def on_event(bindtype, *args): +def on_event(bindtype, globalflags, chanflags, botflags, *args): + flags = FlagRecord(globalflags, chanflags, botflags) for arg in args: print(arg) if bindtype == "pubm": - on_pubm(*args) + on_pubm(flags, *args) elif bindtype == "msgm": - on_msgm(*args) + on_msgm(flags, *args) # py.putserv("PRIVMSG :"+chan+" you are "+nick+" and you said "+text) return 0 -eggdrop.binds.add("pubm", "!hi", "o|o", "*!*@*", myfunc) +eggdrop.binds.add("pubm", "!hi", FlagMatcher(globalflags=UserFlags.op, chanflags=UserFlags.op, requireall=False), "*!*@*", myfunc) \ No newline at end of file diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 8214f0e7d..b3e8cf474 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -46,6 +46,7 @@ static PyObject *pirp, *pglobals; //extern p_tcl_bind_list H_pubm; int runPythonArgs(const char *script, const char *method, int argc, char **argv); +int runPythonPyArgs(const char *script, const char *method, PyObject *pArgs); /* Calculate the memory we keep allocated. @@ -58,19 +59,33 @@ static int python_expmem() return size; } -int py_pubm (char *nick, char *hand, char *host, char *chan, char *text) { - struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL, 0, 0, 0, 0, 0 }; - char *argv[] = {"pubm", nick, host, hand, chan, text}; +int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { + PyObject *pArgs; + char buf[UHOSTLEN]; + struct chanset_t *ch; + struct userrec *u; + struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; - runPythonArgs("binds", "on_event", ARRAYCOUNT(argv), argv); - return 0; + if (!(ch = findchan(chan))) { + putlog(LOG_MISC, "*", "Python: Cannot find pubm channel %s", chan); + return 1; + } + snprintf(buf, sizeof buf, "%s!%s", nick, host); + if ((u = get_user_by_host(buf))) { + get_user_flagrec(u, &fr, chan); + } + if (!(pArgs = Py_BuildValue("(skkksssss)", "pubm", (unsigned long)fr.global, (unsigned long)fr.chan, (unsigned long)fr.bot, nick, host, hand, chan, text))) { + putlog(LOG_MISC, "*", "Python: Cannot convert pubm arguments"); + return 1; + } + return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); } int py_msgm (char *nick, char *hand, char *host, char *text) { - struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL, 0, 0, 0, 0, 0 }; + struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; char *argv[] = {"msgm", nick, host, hand, text}; - runPythonArgs("binds", "on_event", ARRAYCOUNT(argv), argv); + runPythonArgs("eggdroppy.binds.binds", "on_event", ARRAYCOUNT(argv), argv); return 0; } @@ -184,36 +199,19 @@ static void kill_python() { return; } -int runPythonArgs(const char *script, const char *method, int argc, char **argv) +int runPythonPyArgs(const char *script, const char *method, PyObject *pArgs) { - PyObject *pName, *pModule, *pFunc; - PyObject *pArgs, *pValue; - char *pyv[argc]; + PyObject *pName, *pModule, *pFunc, *pValue; pName = PyUnicode_DecodeFSDefault(script); /* Error checking of pName left out */ pModule = PyImport_Import(pName); Py_DECREF(pName); - for (int i = 0; i < argc; i++) { - fprintf(stderr, "pyv[%d] is %s\n", i, argv[i]); - } if (pModule != NULL) { pFunc = PyObject_GetAttrString(pModule, method); /* pFunc is a new reference */ if (pFunc && PyCallable_Check(pFunc)) { - pArgs = PyTuple_New(argc); - for (int i = 0; i < argc; i++) { - pValue = Py_BuildValue("s", argv[i]); - if (!pValue) { - Py_DECREF(pArgs); - Py_DECREF(pModule); - fprintf(stderr, "Cannot convert argument at position %d: '%s'\n", i, argv[i]); - return 1; - } - /* pValue reference stolen here: */ - PyTuple_SetItem(pArgs, i, pValue); - } pValue = PyObject_CallObject(pFunc, pArgs); Py_DECREF(pArgs); if (pValue != NULL) { @@ -238,7 +236,7 @@ int runPythonArgs(const char *script, const char *method, int argc, char **argv) } else { PyErr_Print(); - fprintf(stderr, "Failed to load \"%s\"\n", pyv[0]); + fprintf(stderr, "Failed to load \"%s\"\n", script); return 1; } if (Py_FinalizeEx() < 0) { @@ -247,6 +245,24 @@ int runPythonArgs(const char *script, const char *method, int argc, char **argv) return 0; } +int runPythonArgs(const char *script, const char *method, int argc, char **argv) +{ + PyObject *pArgs, *pValue; + + pArgs = PyTuple_New(argc); + for (int i = 0; i < argc; i++) { + pValue = Py_BuildValue("s", argv[i]); + if (!pValue) { + Py_DECREF(pArgs); + fprintf(stderr, "Cannot convert argument at position %d: '%s'\n", i, argv[i]); + return 1; + } + /* pValue reference stolen here: */ + PyTuple_SetItem(pArgs, i, pValue); + } + return runPythonPyArgs(script, method, pArgs); +} + static void runPython(char *par) { int maxargc = 16; char **argv = NULL; From cf18d3a99d9f2197378d0dc090c2294e62bc89c4 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sat, 20 Mar 2021 15:36:09 +0100 Subject: [PATCH 08/71] Only clean up python interpreter on module unload --- src/mod/python.mod/python.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index b3e8cf474..d9b18277f 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -239,9 +239,6 @@ int runPythonPyArgs(const char *script, const char *method, PyObject *pArgs) fprintf(stderr, "Failed to load \"%s\"\n", script); return 1; } - if (Py_FinalizeEx() < 0) { - return 120; - } return 0; } From 1eec526a5628b3703b8a24995f19466d03c63a51 Mon Sep 17 00:00:00 2001 From: Geo Date: Sat, 10 Apr 2021 09:42:50 -0400 Subject: [PATCH 09/71] starting to add exceptions, cmds --- src/mod/python.mod/python.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index d9b18277f..a885dfcb5 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -36,11 +36,11 @@ #include "src/mod/server.mod/server.h" #include "src/mod/python.mod/python.h" - #undef global static Function *global = NULL, *irc_funcs = NULL; +#include "src/mod/python.mod/pycmds.c" -static PyObject *pymodobj; +//static PyObject *pymodobj; static PyObject *pirp, *pglobals; //extern p_tcl_bind_list H_pubm; @@ -82,7 +82,7 @@ int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { } int py_msgm (char *nick, char *hand, char *host, char *text) { - struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; +// struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; char *argv[] = {"msgm", nick, host, hand, text}; runPythonArgs("eggdroppy.binds.binds", "on_event", ARRAYCOUNT(argv), argv); @@ -98,6 +98,7 @@ static PyObject* py_numargs(PyObject *self, PyObject *args) { return PyLong_FromLong(numargs); } +/* static PyObject* py_putserv(PyObject *self, PyObject *args) { char *s = 0, *t = 0, *p; @@ -126,9 +127,9 @@ static PyObject* py_putserv(PyObject *self, PyObject *args) { dprintf(DP_SERVER, "%s\n", s); return Py_None; } +*/ - -static PyMethodDef PyMethods[] = { +/*static PyMethodDef PyMethods[] = { {"numargs", py_numargs, METH_VARARGS, "Return the number of arguments received by the process."}, {"putserv", py_putserv, METH_VARARGS, "text ?options"}, {NULL, NULL, 0, NULL} @@ -169,9 +170,10 @@ static PyObject* PyInit_py(void) { return pymodobj; } - +*/ static void init_python() { + PyObject *pmodule; wchar_t *program = Py_DecodeLocale("eggdrop", NULL); if (program == NULL) { @@ -179,8 +181,16 @@ static void init_python() { fatal(1); } Py_SetProgramName(program); /* optional but recommended */ - PyImport_AppendInittab("eggdrop", &PyInit_py); + if (PyImport_AppendInittab("eggdrop", PyInit_eggdrop) == -1) { + fprintf(stderr, "Error: could not extend in-built modules table\n"); + exit(1); + } Py_Initialize(); + pmodule = PyImport_ImportModule("eggdrop"); + if (!pmodule) { + PyErr_Print(); + fprintf(stderr, "Error: could not import module 'spam'\n"); + } pirp = PyImport_AddModule("__main__"); pglobals = PyModule_GetDict(pirp); @@ -195,7 +205,7 @@ static void kill_python() { if (Py_FinalizeEx() < 0) { exit(120); } - PyMem_RawFree("eggdrop"); + PyMem_RawFree(Py_DecodeLocale("eggdrop", NULL)); return; } @@ -292,8 +302,8 @@ static void runPython(char *par) { } static void cmd_python(struct userrec *u, int idx, char *par) { - char *result; - PyObject *pobj, *pstr; +// char *result; + PyObject *pobj; PyErr_Clear(); @@ -306,7 +316,7 @@ static void cmd_python(struct userrec *u, int idx, char *par) { } static void cmd_pyexpr(struct userrec *u, int idx, char *par) { - char *result; +// char *result; PyObject *pobj, *pstr; PyErr_Clear(); From 2ac6000575267705e417370e39484a282a415c34 Mon Sep 17 00:00:00 2001 From: Geo Date: Sat, 10 Apr 2021 12:10:59 -0400 Subject: [PATCH 10/71] oh yeah this file too --- src/mod/python.mod/pycmds.c | 108 ++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 src/mod/python.mod/pycmds.c diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c new file mode 100644 index 000000000..0ced50c34 --- /dev/null +++ b/src/mod/python.mod/pycmds.c @@ -0,0 +1,108 @@ +#define PY_SSIZE_T_CLEAN +#include + + +static PyObject *EggdropError; //create static Python Exception object + +static PyObject *testcmd(PyObject *self, PyObject *args) { +//PyDict_Type + PyObject *testdict = PyDict_New(); +// dprintf(LOG_SERV, "this is a thing"); +// fatal("eggdroppy"); + + PyDict_SetItemString(testdict, "return", PyUnicode_FromString("this is the return")); +// PyDict_SetItemString(testdict, "code", 0); + + return testdict; +} + +static PyObject* py_putserv(PyObject *self, PyObject *args) { + char *s = 0, *t = 0, *p; + + if(!PyArg_ParseTuple(args, "s|s", &s, &t)) { +// PyErr_SetString(PyExc_SyntaxError, "wrong number of args"); + PyErr_SetString(EggdropError, "wrong number of args"); + return NULL; + } + +// BADARGS(2, 3, " text ?options?"); + +// if ((argc == 3) && strcasecmp(argv[2], "-next") && +// strcasecmp(argv[2], "-normal")) { +// Tcl_AppendResult(irp, "unknown putserv option: should be one of: ", +// "-normal -next", NULL); +// return TCL_ERROR; +// } + + p = strchr(s, '\n'); + if (p != NULL) + *p = 0; + p = strchr(s, '\r'); + if (p != NULL) + *p = 0; +// if (!strcasecmp(t, "-next")) +// dprintf(DP_SERVER_NEXT, "%s\n", s); +// else + dprintf(DP_SERVER, "%s\n", s); + return NULL; +} + + +static PyMethodDef MyPyMethods[] = { + {"testcmd", testcmd, METH_VARARGS, "A test dict"}, + {"putserv", py_putserv, METH_VARARGS, "Send message to server"}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +static struct PyModuleDef eggdroppy = { + PyModuleDef_HEAD_INIT, + "eggdrop", /* name of module */ + 0, /* module documentation, may be NULL */ + -1, /* size of per-interpreter state of the module, + or -1 if the module keeps state in global variables. */ + MyPyMethods +}; + +PyMODINIT_FUNC PyInit_eggdrop(void) { + PyObject *pymodobj; + + pymodobj = PyModule_Create(&eggdroppy); + if (pymodobj == NULL) + return NULL; + + EggdropError = PyErr_NewException("eggdrop.error", NULL, NULL); + Py_XINCREF(EggdropError); + if (PyModule_AddObject(pymodobj, "error", EggdropError) < 0) { + Py_XDECREF(EggdropError); + Py_CLEAR(EggdropError); + Py_DECREF(pymodobj); + return NULL; + } + + PyModule_AddIntConstant(pymodobj, "USER_AUTOOP", 0x00000001); + PyModule_AddIntConstant(pymodobj, "USER_BOT", 0x00000002); + PyModule_AddIntConstant(pymodobj, "USER_COMMON", 0x00000004); + PyModule_AddIntConstant(pymodobj, "USER_DEOP", 0x00000008); + PyModule_AddIntConstant(pymodobj, "USER_EXEMPT", 0x00000010); + PyModule_AddIntConstant(pymodobj, "USER_FRIEND", 0x00000020); + PyModule_AddIntConstant(pymodobj, "USER_GVOICE", 0x00000040); + PyModule_AddIntConstant(pymodobj, "USER_HIGHLITE", 0x00000080); + PyModule_AddIntConstant(pymodobj, "USER_JANITOR", 0x00000200); + PyModule_AddIntConstant(pymodobj, "USER_KICK", 0x00000400); + PyModule_AddIntConstant(pymodobj, "USER_HALFOP", 0x00000800); + PyModule_AddIntConstant(pymodobj, "USER_MASTER", 0x00001000); + PyModule_AddIntConstant(pymodobj, "USER_OWNER", 0x00002000); + PyModule_AddIntConstant(pymodobj, "USER_OP", 0x00004000); + PyModule_AddIntConstant(pymodobj, "USER_PARTY", 0x00008000); + PyModule_AddIntConstant(pymodobj, "USER_QUIET", 0x00010000); + PyModule_AddIntConstant(pymodobj, "USER_DEHALFOP", 0x00020000); + PyModule_AddIntConstant(pymodobj, "USER_BOTMAST", 0x00080000); + PyModule_AddIntConstant(pymodobj, "USER_UNSHARED", 0x00100000); + PyModule_AddIntConstant(pymodobj, "USER_VOICE", 0x00200000); + PyModule_AddIntConstant(pymodobj, "USER_WASOPTEST", 0x00400000); + PyModule_AddIntConstant(pymodobj, "USER_XFER", 0x00800000); + PyModule_AddIntConstant(pymodobj, "USER_AUTOHALFOP", 0x01000000); + PyModule_AddIntConstant(pymodobj, "USER_WASHALFOPTEST", 0x02000000); + + return pymodobj; +} From 88e3ca6c45bc353b57e149622d6434b6a4fa7181 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Tue, 19 Jul 2022 19:56:36 +0200 Subject: [PATCH 11/71] New update --- .gitignore | 1 + eggdroppy/__init__.py | 3 -- eggdroppy/binds/__init__.py | 1 - eggdroppy/myscript/__init__.py | 7 ---- eggdroppy/myscript/myscript.py | 6 --- scripts/eggdroppy/__init__.py | 1 + scripts/eggdroppy/binds/__init__.py | 2 + .../eggdroppy}/binds/binds.py | 42 ++++++++----------- scripts/myscript/__init__.py | 1 + scripts/myscript/myscript.py | 14 +++++++ 10 files changed, 37 insertions(+), 41 deletions(-) delete mode 100644 eggdroppy/__init__.py delete mode 100644 eggdroppy/binds/__init__.py delete mode 100644 eggdroppy/myscript/__init__.py delete mode 100644 eggdroppy/myscript/myscript.py create mode 100644 scripts/eggdroppy/__init__.py create mode 100644 scripts/eggdroppy/binds/__init__.py rename {eggdroppy => scripts/eggdroppy}/binds/binds.py (81%) create mode 100644 scripts/myscript/__init__.py create mode 100644 scripts/myscript/myscript.py diff --git a/.gitignore b/.gitignore index 52806ce03..37ee0f2d9 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ config.cache eggdrop EGGMOD.stamp mod.xlibs +__pycache__ diff --git a/eggdroppy/__init__.py b/eggdroppy/__init__.py deleted file mode 100644 index 44b1beacf..000000000 --- a/eggdroppy/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -#from .eggdrop.binds import * -from eggdroppy import * -from .myscript import * diff --git a/eggdroppy/binds/__init__.py b/eggdroppy/binds/__init__.py deleted file mode 100644 index 622d7222b..000000000 --- a/eggdroppy/binds/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__all__ = ["binds"] diff --git a/eggdroppy/myscript/__init__.py b/eggdroppy/myscript/__init__.py deleted file mode 100644 index 17ee0edc3..000000000 --- a/eggdroppy/myscript/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -#from ..eggdrop.binds import * -#from ..eggdrop import binds -#from .myscript import * -from .myscript import * - -#eggdrop.binds.add("pubm", "!moo", "*", "*", mypub) -#print("Loaded this") diff --git a/eggdroppy/myscript/myscript.py b/eggdroppy/myscript/myscript.py deleted file mode 100644 index 3712c9085..000000000 --- a/eggdroppy/myscript/myscript.py +++ /dev/null @@ -1,6 +0,0 @@ -def mypub(nick, user, hand, chan, text): - print("!!! "+nick+"+ on "+chan+" said "+text) - return - -#eggdroppy.binds.add("pubm", "!moo", "*", "*", mypub) -print("Loaded this") diff --git a/scripts/eggdroppy/__init__.py b/scripts/eggdroppy/__init__.py new file mode 100644 index 000000000..2b2ed95d5 --- /dev/null +++ b/scripts/eggdroppy/__init__.py @@ -0,0 +1 @@ +from .binds import * diff --git a/scripts/eggdroppy/binds/__init__.py b/scripts/eggdroppy/binds/__init__.py new file mode 100644 index 000000000..e3e9efdd1 --- /dev/null +++ b/scripts/eggdroppy/binds/__init__.py @@ -0,0 +1,2 @@ +from .binds import add, list, FlagMatcher, UserFlags +__all__ = ["add", "list", "FlagMatcher", "UserFlags"] diff --git a/eggdroppy/binds/binds.py b/scripts/eggdroppy/binds/binds.py similarity index 81% rename from eggdroppy/binds/binds.py rename to scripts/eggdroppy/binds/binds.py index 39e4911cc..1fd952e43 100644 --- a/eggdroppy/binds/binds.py +++ b/scripts/eggdroppy/binds/binds.py @@ -84,21 +84,18 @@ def __repr__(self): }) -class Eggdrop: - def __init__(self, binds): - self.binds = binds - class Binds: def __init__(self): self.bindlist = {"msgm": {}, "pubm": {}} def list(self, mask=None): if not mask: - print(self.bindlist) + result = self.bindlist else: + result = [] for i in self.bindlist[mask]: - print(self.bindlist[mask][i]) - return + result += self.bindlist[mask][i] + return result def add(self, bindtype, cmd, flags, mask, callback): self.bindlist[bindtype][cmd]={} @@ -107,9 +104,6 @@ def add(self, bindtype, cmd, flags, mask, callback): self.bindlist[bindtype][cmd]["flags"] = flags return -my_binds = Binds() -eggdrop = Eggdrop(binds=my_binds) - import re def bindmask2re(mask): @@ -128,27 +122,23 @@ def bindmask2re(mask): return re.compile('^' + r + '$') -def myfunc(nick, user, hand, chan, text): - print("Holy shit this worked- "+nick+" on "+chan+" said "+text) - return - def on_pubm(flags, nick, user, hand, chan, text): pprint(flags) print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) - for i in eggdrop.binds.bindlist["pubm"]: - print("mask is "+eggdrop.binds.bindlist["pubm"][i]["mask"]) - if eggdrop.binds.bindlist["pubm"][i]["flags"].match(flags): - print("flagmatcher {} matches flag record {}".format(repr(eggdrop.binds.bindlist["pubm"][i]["flags"]), repr(flags))) - eggdrop.binds.bindlist["pubm"][i]["callback"](nick, user, hand, chan, text) + for i in __allbinds.bindlist["pubm"]: + print("mask is "+__allbinds.bindlist["pubm"][i]["mask"]) + if __allbinds.bindlist["pubm"][i]["flags"].match(flags): + print("flagmatcher {} matches flag record {}".format(repr(__allbinds.bindlist["pubm"][i]["flags"]), repr(flags))) + __allbinds.bindlist["pubm"][i]["callback"](nick, user, hand, chan, text) else: - print("flagmatcher {} does not match flag record {}".format(repr(eggdrop.binds.bindlist["pubm"][i]["flags"]), repr(flags))) + print("flagmatcher {} does not match flag record {}".format(repr(__allbinds.bindlist["pubm"][i]["flags"]), repr(flags))) return def on_msgm(nick, user, hand, text): print("msgm bind triggered with "+" ".join([nick, user, hand, text])) - for i in eggdrop.binds.bindlist["pubm"]: - print("mask is "+eggdrop.binds.bindlist["msgm"][i]["mask"]) - eggdrop.binds.bindlist["msgm"][i]["callback"](nick, user, hand, text) + for i in __allbinds.bindlist["pubm"]: + print("mask is "+__allbinds.bindlist["msgm"][i]["mask"]) + __allbinds.bindlist["msgm"][i]["callback"](nick, user, hand, text) return def on_event(bindtype, globalflags, chanflags, botflags, *args): @@ -162,4 +152,8 @@ def on_event(bindtype, globalflags, chanflags, botflags, *args): # py.putserv("PRIVMSG :"+chan+" you are "+nick+" and you said "+text) return 0 -eggdrop.binds.add("pubm", "!hi", FlagMatcher(globalflags=UserFlags.op, chanflags=UserFlags.op, requireall=False), "*!*@*", myfunc) \ No newline at end of file +__allbinds = Binds() +def add(bindtype, cmd, flags, mask, callback): + __allbinds.add(bindtype, cmd, flags, mask, callback) +def list(mask=None): + return __allbinds.list(mask) diff --git a/scripts/myscript/__init__.py b/scripts/myscript/__init__.py new file mode 100644 index 000000000..37b59a952 --- /dev/null +++ b/scripts/myscript/__init__.py @@ -0,0 +1 @@ +from . import myscript diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py new file mode 100644 index 000000000..1f6735f30 --- /dev/null +++ b/scripts/myscript/myscript.py @@ -0,0 +1,14 @@ +from eggdroppy import binds +from pprint import pprint + +def mypub(nick, user, hand, chan, text): + print("!!! "+nick+"+ on "+chan+" said "+text) + return + +def mypub2(nick, user, hand, chan, text): + print("!!! "+nick+"+ on "+chan+" said "+text+" and is a global +o") + return + +binds.add("pubm", "!moo", binds.FlagMatcher(), "*", mypub) +binds.add("pubm", "!moo*", binds.FlagMatcher(globalflags=binds.UserFlags.o), "*", mypub2) +pprint(binds.list()) From 3e2d142479606ff7dd7a3a2c1dd0f343d2c0f339 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Tue, 19 Jul 2022 20:59:04 +0200 Subject: [PATCH 12/71] bind match for pubm, only matches text, not channel --- scripts/eggdroppy/binds/binds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/eggdroppy/binds/binds.py b/scripts/eggdroppy/binds/binds.py index 1fd952e43..1fa3ac8f2 100644 --- a/scripts/eggdroppy/binds/binds.py +++ b/scripts/eggdroppy/binds/binds.py @@ -127,7 +127,7 @@ def on_pubm(flags, nick, user, hand, chan, text): print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) for i in __allbinds.bindlist["pubm"]: print("mask is "+__allbinds.bindlist["pubm"][i]["mask"]) - if __allbinds.bindlist["pubm"][i]["flags"].match(flags): + if __allbinds.bindlist["pubm"][i]["flags"].match(flags) and bindmask2re(__allbinds.bindlist["pubm"][i]["mask"]).match(text): print("flagmatcher {} matches flag record {}".format(repr(__allbinds.bindlist["pubm"][i]["flags"]), repr(flags))) __allbinds.bindlist["pubm"][i]["callback"](nick, user, hand, chan, text) else: From 2fb2dd8b44e8b423b52d0dfc93ed41796447c966 Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 19 Jul 2022 23:26:02 -0400 Subject: [PATCH 13/71] update bind logic --- scripts/eggdroppy/binds/binds.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/eggdroppy/binds/binds.py b/scripts/eggdroppy/binds/binds.py index 1fa3ac8f2..27bb92a22 100644 --- a/scripts/eggdroppy/binds/binds.py +++ b/scripts/eggdroppy/binds/binds.py @@ -87,7 +87,6 @@ def __repr__(self): class Binds: def __init__(self): self.bindlist = {"msgm": {}, "pubm": {}} - def list(self, mask=None): if not mask: result = self.bindlist @@ -96,7 +95,6 @@ def list(self, mask=None): for i in self.bindlist[mask]: result += self.bindlist[mask][i] return result - def add(self, bindtype, cmd, flags, mask, callback): self.bindlist[bindtype][cmd]={} self.bindlist[bindtype][cmd]["callback"] = callback @@ -127,7 +125,7 @@ def on_pubm(flags, nick, user, hand, chan, text): print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) for i in __allbinds.bindlist["pubm"]: print("mask is "+__allbinds.bindlist["pubm"][i]["mask"]) - if __allbinds.bindlist["pubm"][i]["flags"].match(flags) and bindmask2re(__allbinds.bindlist["pubm"][i]["mask"]).match(text): + if __allbinds.bindlist["pubm"][i]["flags"].match(flags) and bindmask2re(i).match(text): print("flagmatcher {} matches flag record {}".format(repr(__allbinds.bindlist["pubm"][i]["flags"]), repr(flags))) __allbinds.bindlist["pubm"][i]["callback"](nick, user, hand, chan, text) else: From e47d987e6e4b097803b2f2466826c89004b04912 Mon Sep 17 00:00:00 2001 From: Geo Date: Wed, 20 Jul 2022 15:56:28 -0400 Subject: [PATCH 14/71] convert binds to list and auto-load eggdroppy at runtime --- scripts/eggdroppy/binds/binds.py | 17 +++++++---------- src/mod/python.mod/python.c | 7 +++++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/eggdroppy/binds/binds.py b/scripts/eggdroppy/binds/binds.py index 27bb92a22..b3a18ff3d 100644 --- a/scripts/eggdroppy/binds/binds.py +++ b/scripts/eggdroppy/binds/binds.py @@ -86,7 +86,7 @@ def __repr__(self): class Binds: def __init__(self): - self.bindlist = {"msgm": {}, "pubm": {}} + self.bindlist = {"msgm": [], "pubm": []} def list(self, mask=None): if not mask: result = self.bindlist @@ -96,10 +96,7 @@ def list(self, mask=None): result += self.bindlist[mask][i] return result def add(self, bindtype, cmd, flags, mask, callback): - self.bindlist[bindtype][cmd]={} - self.bindlist[bindtype][cmd]["callback"] = callback - self.bindlist[bindtype][cmd]["mask"] = mask - self.bindlist[bindtype][cmd]["flags"] = flags + self.bindlist[bindtype].append({"cmd" : cmd, "callback" : callback, "mask" : mask, "flags" : flags}) return import re @@ -124,12 +121,12 @@ def on_pubm(flags, nick, user, hand, chan, text): pprint(flags) print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) for i in __allbinds.bindlist["pubm"]: - print("mask is "+__allbinds.bindlist["pubm"][i]["mask"]) - if __allbinds.bindlist["pubm"][i]["flags"].match(flags) and bindmask2re(i).match(text): - print("flagmatcher {} matches flag record {}".format(repr(__allbinds.bindlist["pubm"][i]["flags"]), repr(flags))) - __allbinds.bindlist["pubm"][i]["callback"](nick, user, hand, chan, text) + print("mask is "+i["mask"]) + if i["flags"].match(flags) and bindmask2re(i["cmd"]).match(text): + print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) + i["callback"](nick, user, hand, chan, text) else: - print("flagmatcher {} does not match flag record {}".format(repr(__allbinds.bindlist["pubm"][i]["flags"]), repr(flags))) + print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) return def on_msgm(nick, user, hand, text): diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index a885dfcb5..42928a72e 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -197,6 +197,7 @@ static void init_python() { PyRun_SimpleString("import sys"); PyRun_SimpleString("sys.path.append(\".\")"); + PyRun_SimpleString("from eggdroppy import binds"); return; } @@ -344,6 +345,11 @@ static void cmd_pysource(struct userrec *u, int idx, char *par) { return; } +static void cmd_pybinds(struct userrec *u, int idx, char *par) { + cmd_pyexpr(u, idx, "binds.list()"); + return; +} + /* A report on the module status. * * details is either 0 or 1: @@ -365,6 +371,7 @@ static cmd_t mydcc[] = { {"pysource", "", (IntFunc) cmd_pysource, NULL}, {"python", "", (IntFunc) cmd_python, NULL}, {"pyexpr", "", (IntFunc) cmd_pyexpr, NULL}, + {"pybinds", "", (IntFunc) cmd_pybinds, NULL}, {NULL, NULL, NULL, NULL} /* Mark end. */ }; From e8a75c5674ccb3a840369f12e5d0c3b2739d4f01 Mon Sep 17 00:00:00 2001 From: Geo Date: Wed, 20 Jul 2022 21:29:26 -0400 Subject: [PATCH 15/71] Better loading of eggdroppy at run --- src/mod/python.mod/python.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 42928a72e..cab5eb8b2 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -173,7 +173,7 @@ static PyObject* PyInit_py(void) { */ static void init_python() { - PyObject *pmodule; + PyObject *pmodule, *emodule, *bmodule, *maindict, *mainmod; wchar_t *program = Py_DecodeLocale("eggdrop", NULL); if (program == NULL) { @@ -197,8 +197,15 @@ static void init_python() { PyRun_SimpleString("import sys"); PyRun_SimpleString("sys.path.append(\".\")"); - PyRun_SimpleString("from eggdroppy import binds"); - + bmodule = PyImport_ImportModule("eggdroppy"); + Py_INCREF(bmodule); + PyModule_AddObject(pirp, "eggdroppy", bmodule); + emodule = PyImport_AddModule("eggdroppy"); + PyModule_AddObject(pirp, "binds", emodule); + if (!bmodule) { + PyErr_Print(); + fprintf(stderr, "Error: could not import module 'eggdroppy'\n"); + } return; } From e812953ae8d8542c1b7e5948da4c331f84404d34 Mon Sep 17 00:00:00 2001 From: Geo Date: Fri, 29 Jul 2022 00:02:08 -0400 Subject: [PATCH 16/71] start to add pub, and... removed module name collision, and MOST IMPORTANT- fixed the PyImport_AppendInittab function to add & to PyInit_eggdrop- THIS WAS WHAT WAS BREAKGING THE SCOPE STUFF, and what I was trying to ass-backwards fix by forcing an import the wrong way --- src/mod/python.mod/pycmds.c | 22 +++---- src/mod/python.mod/python.c | 126 ++++++++++-------------------------- 2 files changed, 44 insertions(+), 104 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 0ced50c34..a3349f1b7 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -8,7 +8,7 @@ static PyObject *testcmd(PyObject *self, PyObject *args) { //PyDict_Type PyObject *testdict = PyDict_New(); // dprintf(LOG_SERV, "this is a thing"); -// fatal("eggdroppy"); +// fatal("eggdrop"); PyDict_SetItemString(testdict, "return", PyUnicode_FromString("this is the return")); // PyDict_SetItemString(testdict, "code", 0); @@ -16,10 +16,10 @@ static PyObject *testcmd(PyObject *self, PyObject *args) { return testdict; } -static PyObject* py_putserv(PyObject *self, PyObject *args) { - char *s = 0, *t = 0, *p; +static PyObject *py_putmsg(PyObject *self, PyObject *args) { + char *chan = 0, *msg = 0, *p; - if(!PyArg_ParseTuple(args, "s|s", &s, &t)) { + if(!PyArg_ParseTuple(args, "ss", &chan, &msg)) { // PyErr_SetString(PyExc_SyntaxError, "wrong number of args"); PyErr_SetString(EggdropError, "wrong number of args"); return NULL; @@ -34,27 +34,27 @@ static PyObject* py_putserv(PyObject *self, PyObject *args) { // return TCL_ERROR; // } - p = strchr(s, '\n'); + p = strchr(chan, '\n'); if (p != NULL) *p = 0; - p = strchr(s, '\r'); + p = strchr(chan, '\r'); if (p != NULL) *p = 0; // if (!strcasecmp(t, "-next")) // dprintf(DP_SERVER_NEXT, "%s\n", s); // else - dprintf(DP_SERVER, "%s\n", s); - return NULL; + dprintf(DP_SERVER, "PRIVMSG %s :%s\n", chan, msg); + Py_RETURN_NONE; } static PyMethodDef MyPyMethods[] = { {"testcmd", testcmd, METH_VARARGS, "A test dict"}, - {"putserv", py_putserv, METH_VARARGS, "Send message to server"}, + {"putmsg", py_putmsg, METH_VARARGS, "Send message to server"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; -static struct PyModuleDef eggdroppy = { +static struct PyModuleDef eggdrop = { PyModuleDef_HEAD_INIT, "eggdrop", /* name of module */ 0, /* module documentation, may be NULL */ @@ -66,7 +66,7 @@ static struct PyModuleDef eggdroppy = { PyMODINIT_FUNC PyInit_eggdrop(void) { PyObject *pymodobj; - pymodobj = PyModule_Create(&eggdroppy); + pymodobj = PyModule_Create(&eggdrop); if (pymodobj == NULL) return NULL; diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index cab5eb8b2..887e6d7c9 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -59,6 +59,30 @@ static int python_expmem() return size; } +int py_pub (char *nick, char *host, char *hand, char *chan, char *text) { + PyObject *pArgs; + char buf[UHOSTLEN]; + struct chanset_t *ch; + struct userrec *u; + struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; + + + if (!(ch = findchan(chan))) { + putlog(LOG_MISC, "*", "Python: Cannot find pub channel %s", chan); + return 1; + } + + snprintf(buf, sizeof buf, "%s!%s", nick, host); + if ((u = get_user_by_host(buf))) { + get_user_flagrec(u, &fr, chan); + } + if (!(pArgs = Py_BuildValue("(skkksssss)", "pub", (unsigned long)fr.global, (unsigned long)fr.chan, (unsigned long)fr.bot, nick, host, hand, chan, text))) { + putlog(LOG_MISC, "*", "Python: Cannot convert pub arguments"); + return 1; + } + return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); +} + int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { PyObject *pArgs; char buf[UHOSTLEN]; @@ -89,89 +113,6 @@ int py_msgm (char *nick, char *hand, char *host, char *text) { return 0; } - -static PyObject* py_numargs(PyObject *self, PyObject *args) { - int numargs = 2; - - if(!PyArg_ParseTuple(args, "i:numargs", &numargs)) - return NULL; - return PyLong_FromLong(numargs); -} - -/* -static PyObject* py_putserv(PyObject *self, PyObject *args) { - char *s = 0, *t = 0, *p; - - if(!PyArg_ParseTuple(args, "s|s", &s, &t)) { - return NULL; - } - -// BADARGS(2, 3, " text ?options?"); - -// if ((argc == 3) && strcasecmp(argv[2], "-next") && -// strcasecmp(argv[2], "-normal")) { -// Tcl_AppendResult(irp, "unknown putserv option: should be one of: ", -// "-normal -next", NULL); -// return TCL_ERROR; -// } - - p = strchr(s, '\n'); - if (p != NULL) - *p = 0; - p = strchr(s, '\r'); - if (p != NULL) - *p = 0; -// if (!strcasecmp(t, "-next")) -// dprintf(DP_SERVER_NEXT, "%s\n", s); -// else - dprintf(DP_SERVER, "%s\n", s); - return Py_None; -} -*/ - -/*static PyMethodDef PyMethods[] = { - {"numargs", py_numargs, METH_VARARGS, "Return the number of arguments received by the process."}, - {"putserv", py_putserv, METH_VARARGS, "text ?options"}, - {NULL, NULL, 0, NULL} -}; - -static PyModuleDef PyModule = { - PyModuleDef_HEAD_INIT, "eggdrop", NULL, -1, PyMethods, - NULL, NULL, NULL, NULL -}; - -static PyObject* PyInit_py(void) { - pymodobj = PyModule_Create(&PyModule); - - PyModule_AddIntConstant(pymodobj, "USER_AUTOOP", 0x00000001); - PyModule_AddIntConstant(pymodobj, "USER_BOT", 0x00000002); - PyModule_AddIntConstant(pymodobj, "USER_COMMON", 0x00000004); - PyModule_AddIntConstant(pymodobj, "USER_DEOP", 0x00000008); - PyModule_AddIntConstant(pymodobj, "USER_EXEMPT", 0x00000010); - PyModule_AddIntConstant(pymodobj, "USER_FRIEND", 0x00000020); - PyModule_AddIntConstant(pymodobj, "USER_GVOICE", 0x00000040); - PyModule_AddIntConstant(pymodobj, "USER_HIGHLITE", 0x00000080); - PyModule_AddIntConstant(pymodobj, "USER_JANITOR", 0x00000200); - PyModule_AddIntConstant(pymodobj, "USER_KICK", 0x00000400); - PyModule_AddIntConstant(pymodobj, "USER_HALFOP", 0x00000800); - PyModule_AddIntConstant(pymodobj, "USER_MASTER", 0x00001000); - PyModule_AddIntConstant(pymodobj, "USER_OWNER", 0x00002000); - PyModule_AddIntConstant(pymodobj, "USER_OP", 0x00004000); - PyModule_AddIntConstant(pymodobj, "USER_PARTY", 0x00008000); - PyModule_AddIntConstant(pymodobj, "USER_QUIET", 0x00010000); - PyModule_AddIntConstant(pymodobj, "USER_DEHALFOP", 0x00020000); - PyModule_AddIntConstant(pymodobj, "USER_BOTMAST", 0x00080000); - PyModule_AddIntConstant(pymodobj, "USER_UNSHARED", 0x00100000); - PyModule_AddIntConstant(pymodobj, "USER_VOICE", 0x00200000); - PyModule_AddIntConstant(pymodobj, "USER_WASOPTEST", 0x00400000); - PyModule_AddIntConstant(pymodobj, "USER_XFER", 0x00800000); - PyModule_AddIntConstant(pymodobj, "USER_AUTOHALFOP", 0x01000000); - PyModule_AddIntConstant(pymodobj, "USER_WASHALFOPTEST", 0x02000000); - - return pymodobj; -} -*/ - static void init_python() { PyObject *pmodule, *emodule, *bmodule, *maindict, *mainmod; wchar_t *program = Py_DecodeLocale("eggdrop", NULL); @@ -181,7 +122,7 @@ static void init_python() { fatal(1); } Py_SetProgramName(program); /* optional but recommended */ - if (PyImport_AppendInittab("eggdrop", PyInit_eggdrop) == -1) { + if (PyImport_AppendInittab("eggdrop", &PyInit_eggdrop) == -1) { fprintf(stderr, "Error: could not extend in-built modules table\n"); exit(1); } @@ -197,15 +138,7 @@ static void init_python() { PyRun_SimpleString("import sys"); PyRun_SimpleString("sys.path.append(\".\")"); - bmodule = PyImport_ImportModule("eggdroppy"); - Py_INCREF(bmodule); - PyModule_AddObject(pirp, "eggdroppy", bmodule); - emodule = PyImport_AddModule("eggdroppy"); - PyModule_AddObject(pirp, "binds", emodule); - if (!bmodule) { - PyErr_Print(); - fprintf(stderr, "Error: could not import module 'eggdroppy'\n"); - } + return; } @@ -382,6 +315,11 @@ static cmd_t mydcc[] = { {NULL, NULL, NULL, NULL} /* Mark end. */ }; +static cmd_t mypy_pub[] = { + {"*", "", py_pub, "python:pub"}, + {NULL, NULL, NULL, NULL} +}; + static cmd_t mypy_pubm[] = { {"*", "", py_pubm, "python:pubm"}, {NULL, NULL, NULL, NULL} @@ -415,6 +353,7 @@ static char *python_close() Context; kill_python(); rem_builtins(H_dcc, mydcc); + rem_builtins(H_pub, mypy_pub); rem_builtins(H_pubm, mypy_pubm); // rem_tcl_commands(mytcl); // rem_tcl_ints(my_tcl_ints); @@ -460,6 +399,7 @@ char *python_start(Function *global_funcs) init_python(); /* Add command table to bind list */ + add_builtins(H_pub, mypy_pub); add_builtins(H_pubm, mypy_pubm); add_builtins(H_dcc, mydcc); // add_tcl_commands(mytcl); From de413569446d63245990d5ad349734f3fc9c4953 Mon Sep 17 00:00:00 2001 From: Geo Date: Fri, 29 Jul 2022 00:04:17 -0400 Subject: [PATCH 17/71] testscript update --- scripts/eggdroppy/binds/binds.py | 20 +++++++++++++++++++- scripts/myscript/myscript.py | 15 +++++++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/scripts/eggdroppy/binds/binds.py b/scripts/eggdroppy/binds/binds.py index b3a18ff3d..5bd2294f7 100644 --- a/scripts/eggdroppy/binds/binds.py +++ b/scripts/eggdroppy/binds/binds.py @@ -86,7 +86,7 @@ def __repr__(self): class Binds: def __init__(self): - self.bindlist = {"msgm": [], "pubm": []} + self.bindlist = {"pub": [], "msgm": [], "pubm": []} def list(self, mask=None): if not mask: result = self.bindlist @@ -95,6 +95,12 @@ def list(self, mask=None): for i in self.bindlist[mask]: result += self.bindlist[mask][i] return result + def prettylist(self, mask=None): + if not mask: + for bindtype in self.bindlist: + for bindentry in self.bindlist[bindtype]: + print(" "+bindtype+" "+str(bindentry['flags'])+" "+bindentry['cmd']) + return def add(self, bindtype, cmd, flags, mask, callback): self.bindlist[bindtype].append({"cmd" : cmd, "callback" : callback, "mask" : mask, "flags" : flags}) return @@ -116,6 +122,16 @@ def bindmask2re(mask): r += re.escape(c) return re.compile('^' + r + '$') +def on_pub(flags, nick, user, hand, chan, text): + print("pub bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) + for i in __allbinds.bindlist["pub"]: + print("command is "+i[mask]) + if i["flags"].match(flags) and (i["cmd"] == text.split()[0]): + print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) + i["callback"](nick, user, hand, chan, text.split()[1:]) + else: + print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) + return def on_pubm(flags, nick, user, hand, chan, text): pprint(flags) @@ -140,6 +156,8 @@ def on_event(bindtype, globalflags, chanflags, botflags, *args): flags = FlagRecord(globalflags, chanflags, botflags) for arg in args: print(arg) + if bindtype == "pub": + on_pub(flags, *args); if bindtype == "pubm": on_pubm(flags, *args) elif bindtype == "msgm": diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py index 1f6735f30..501b21ab3 100644 --- a/scripts/myscript/myscript.py +++ b/scripts/myscript/myscript.py @@ -1,5 +1,14 @@ +import requests +from bs4 import BeautifulSoup from eggdroppy import binds from pprint import pprint +import eggdrop + +def getTitle(nick, user, hand, chan, text): + print("text is "+text) + reqs = requests.get(text.split()[1]) + soup = BeautifulSoup(reqs.text, 'html.parser') + eggdrop.putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) def mypub(nick, user, hand, chan, text): print("!!! "+nick+"+ on "+chan+" said "+text) @@ -9,6 +18,8 @@ def mypub2(nick, user, hand, chan, text): print("!!! "+nick+"+ on "+chan+" said "+text+" and is a global +o") return -binds.add("pubm", "!moo", binds.FlagMatcher(), "*", mypub) -binds.add("pubm", "!moo*", binds.FlagMatcher(globalflags=binds.UserFlags.o), "*", mypub2) +#binds.add("pubm", "!moo", binds.FlagMatcher(), "*", mypub) +#binds.add("pubm", "!moo*", binds.FlagMatcher(globalflags=binds.UserFlags.o), "*", mypub2) +binds.add("pub", "!title", binds.FlagMatcher(), "*", getTitle) +binds.add("pubm", "!title*", binds.FlagMatcher(), "*", getTitle) pprint(binds.list()) From 25dd9053e3498fdb02176a62ada64f142673cc72 Mon Sep 17 00:00:00 2001 From: Geo Date: Fri, 29 Jul 2022 00:09:00 -0400 Subject: [PATCH 18/71] remove old file --- binds.py | 55 ------------------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 binds.py diff --git a/binds.py b/binds.py deleted file mode 100644 index c05e5e81f..000000000 --- a/binds.py +++ /dev/null @@ -1,55 +0,0 @@ -#import py - - -class Eggdrop: - def __init__(self, binds): - self.binds = binds - -class Binds: - def __init__(self): - self.bindlist = {"msgm": {}, "pubm": {}} - - def list(self, mask=None): - if not mask: - print(self.bindlist) - else: - for i in self.bindlist[mask]: - print(self.bindlist[mask][i]) - return - - def add(self, bindtype, cmd, callback): - self.bindlist[bindtype][cmd] = callback - return - -my_binds = Binds() -eggdrop = Eggdrop(binds=my_binds) - - -def myfunc(nick, user, hand, chan, text): - print("Holy shit this worked- "+nick+" on "+chan+" said "+text) - return - -def on_pubm(nick, user, hand, chan, text): - global eggdrop - print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) - for i in eggdrop.binds.bindlist["pubm"]: - eggdrop.binds.bindlist["pubm"][i](nick, user, hand, chan, text) - return - -def on_msgm(nick, user, hand, text): - print("msgm bind triggered with "+" ".join([nick, user, hand, chan, text])) - return - -### add, delete, list - -def on_event(bindtype, *args): - for arg in args: - print(arg) - if bindtype == "pubm": - on_pubm(*args) - elif bindtype == "msgm": - on_msgm(*args) -# py.putserv("PRIVMSG :"+chan+" you are "+nick+" and you said "+text) - return 0 - -eggdrop.binds.add("pubm", "!hi", myfunc) From 266b7bbd805ebf05d6767a8b23200bbe07f96c0b Mon Sep 17 00:00:00 2001 From: Geo Date: Sat, 30 Jul 2022 22:43:35 -0400 Subject: [PATCH 19/71] added join, changed bind class --- scripts/eggdroppy/binds/binds.py | 82 +++++++++++++++++++++++--------- scripts/myscript/myscript.py | 18 +++++-- src/mod/python.mod/python.c | 40 +++++++--------- 3 files changed, 91 insertions(+), 49 deletions(-) diff --git a/scripts/eggdroppy/binds/binds.py b/scripts/eggdroppy/binds/binds.py index 5bd2294f7..5ec886f92 100644 --- a/scripts/eggdroppy/binds/binds.py +++ b/scripts/eggdroppy/binds/binds.py @@ -1,4 +1,5 @@ import re +import uuid from enum import IntFlag import eggdrop from pprint import pprint @@ -82,28 +83,46 @@ def __repr__(self): 'botnegmatch': repr(self.botnegflags), 'requireall': repr(self.requireall) }) - + +class BindType(dict): +# def __init__(self): + def add(self, callback, flags, mask): + self.update({uuid.uuid4().hex[:8]:{"callback":callback, "flags":flags, "mask":mask}}) + def list(self): + for i in self: + print(self[i]) class Binds: def __init__(self): - self.bindlist = {"pub": [], "msgm": [], "pubm": []} - def list(self, mask=None): - if not mask: - result = self.bindlist - else: - result = [] - for i in self.bindlist[mask]: - result += self.bindlist[mask][i] - return result - def prettylist(self, mask=None): - if not mask: - for bindtype in self.bindlist: - for bindentry in self.bindlist[bindtype]: - print(" "+bindtype+" "+str(bindentry['flags'])+" "+bindentry['cmd']) - return - def add(self, bindtype, cmd, flags, mask, callback): - self.bindlist[bindtype].append({"cmd" : cmd, "callback" : callback, "mask" : mask, "flags" : flags}) - return + pubm = BindType() + join = BindType() + def list(self): + for i in vars(self): + ret = getattr(self, i).list() + if ret: + print(ret) + + +#class Binds: +# def __init__(self): +# self.bindlist = {"pub": [], "msgm": [], "pubm": [], "join": []} +# def list(self, mask=None): +# if not mask: +# result = self.bindlist +# else: +# result = [] +# for i in self.bindlist[mask]: +# result += self.bindlist[mask][i] +# return result + # def prettylist(self, mask=None): +# if not mask: +# for bindtype in self.bindlist: +# for bindentry in self.bindlist[bindtype]: +# print(" "+bindtype+" "+str(bindentry['flags'])+" "+bindentry['cmd']) +# return +# def add(self, bindtype, cmd, flags, mask, callback): +# self.bindlist[bindtype].append({"cmd" : cmd, "callback" : callback, "mask" : mask, "flags" : flags}) +# return import re @@ -124,11 +143,11 @@ def bindmask2re(mask): def on_pub(flags, nick, user, hand, chan, text): print("pub bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) + print(__allbinds.bindlist["pub"]) for i in __allbinds.bindlist["pub"]: - print("command is "+i[mask]) if i["flags"].match(flags) and (i["cmd"] == text.split()[0]): print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) - i["callback"](nick, user, hand, chan, text.split()[1:]) + i["callback"](nick, user, hand, chan, text.split(" ", 1)[1]) else: print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) return @@ -138,11 +157,12 @@ def on_pubm(flags, nick, user, hand, chan, text): print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) for i in __allbinds.bindlist["pubm"]: print("mask is "+i["mask"]) - if i["flags"].match(flags) and bindmask2re(i["cmd"]).match(text): + if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) i["callback"](nick, user, hand, chan, text) else: print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) + on_pub(flags, nick, user, hand, chan, text) return def on_msgm(nick, user, hand, text): @@ -152,6 +172,24 @@ def on_msgm(nick, user, hand, text): __allbinds.bindlist["msgm"][i]["callback"](nick, user, hand, text) return +def on_join(flags, nick, user, hand, chan): + """This method searches for binds to be triggered when a user joins a channel. + + :param mask: a user hostmask, wildcards supported + :param flags: flags for the user + + :returns: nick hostmask handle channel + """ + print("-={ join bind triggered") + for i in __allbinds.bindlist["join"]: + if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): + print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) + i["callback"](nick, user, hand, chan, text) + else: + print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) + on_pub(flags, nick, user, hand, chan, text) + + def on_event(bindtype, globalflags, chanflags, botflags, *args): flags = FlagRecord(globalflags, chanflags, botflags) for arg in args: diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py index 501b21ab3..66177d9fa 100644 --- a/scripts/myscript/myscript.py +++ b/scripts/myscript/myscript.py @@ -4,14 +4,20 @@ from pprint import pprint import eggdrop -def getTitle(nick, user, hand, chan, text): - print("text is "+text) +def pubGetTitle(nick, user, hand, chan, text): + print(text) + reqs = requests.get(text) + soup = BeautifulSoup(reqs.text, 'html.parser') + eggdrop.putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) + +def pubmGetTitle(nick, user, hand, chan, text): + print(text) reqs = requests.get(text.split()[1]) soup = BeautifulSoup(reqs.text, 'html.parser') eggdrop.putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) def mypub(nick, user, hand, chan, text): - print("!!! "+nick+"+ on "+chan+" said "+text) + eggdrop.putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) return def mypub2(nick, user, hand, chan, text): @@ -20,6 +26,8 @@ def mypub2(nick, user, hand, chan, text): #binds.add("pubm", "!moo", binds.FlagMatcher(), "*", mypub) #binds.add("pubm", "!moo*", binds.FlagMatcher(globalflags=binds.UserFlags.o), "*", mypub2) -binds.add("pub", "!title", binds.FlagMatcher(), "*", getTitle) -binds.add("pubm", "!title*", binds.FlagMatcher(), "*", getTitle) +#binds.add("pub", "!title", binds.FlagMatcher(), "*", pubGetTitle) +#binds.add("pubm", "what*", binds.FlagMatcher(), "*", pubmGetTitle) +binds.join.add(joinGreetUser, binds.FlagMatcher(), "*") +binds.pubm.add(mypub, binds.FlagMatcher(), "*") pprint(binds.list()) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 887e6d7c9..61a334228 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -59,31 +59,29 @@ static int python_expmem() return size; } -int py_pub (char *nick, char *host, char *hand, char *chan, char *text) { +int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { PyObject *pArgs; char buf[UHOSTLEN]; struct chanset_t *ch; struct userrec *u; struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; - if (!(ch = findchan(chan))) { - putlog(LOG_MISC, "*", "Python: Cannot find pub channel %s", chan); + putlog(LOG_MISC, "*", "Python: Cannot find pubm channel %s", chan); return 1; } - snprintf(buf, sizeof buf, "%s!%s", nick, host); if ((u = get_user_by_host(buf))) { get_user_flagrec(u, &fr, chan); } - if (!(pArgs = Py_BuildValue("(skkksssss)", "pub", (unsigned long)fr.global, (unsigned long)fr.chan, (unsigned long)fr.bot, nick, host, hand, chan, text))) { - putlog(LOG_MISC, "*", "Python: Cannot convert pub arguments"); + if (!(pArgs = Py_BuildValue("(skkksssss)", "pubm", (unsigned long)fr.global, (unsigned long)fr.chan, (unsigned long)fr.bot, nick, host, hand, chan, text))) { + putlog(LOG_MISC, "*", "Python: Cannot convert pubm arguments"); return 1; } return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); } -int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { +int py_join (char *nick, char *host, char *hand, char *chan) { PyObject *pArgs; char buf[UHOSTLEN]; struct chanset_t *ch; @@ -98,13 +96,18 @@ int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { if ((u = get_user_by_host(buf))) { get_user_flagrec(u, &fr, chan); } - if (!(pArgs = Py_BuildValue("(skkksssss)", "pubm", (unsigned long)fr.global, (unsigned long)fr.chan, (unsigned long)fr.bot, nick, host, hand, chan, text))) { - putlog(LOG_MISC, "*", "Python: Cannot convert pubm arguments"); + if (!(pArgs = Py_BuildValue("(skkkssss)", "join", (unsigned long)fr.global, (unsigned long)fr.chan, (unsigned long)fr.bot, nick, host, hand, chan))) { + putlog(LOG_MISC, "*", "Python: Cannot convert join arguments"); return 1; } return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); } + + + return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); +} + int py_msgm (char *nick, char *hand, char *host, char *text) { // struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; char *argv[] = {"msgm", nick, host, hand, text}; @@ -114,7 +117,7 @@ int py_msgm (char *nick, char *hand, char *host, char *text) { } static void init_python() { - PyObject *pmodule, *emodule, *bmodule, *maindict, *mainmod; + PyObject *pmodule; wchar_t *program = Py_DecodeLocale("eggdrop", NULL); if (program == NULL) { @@ -243,13 +246,8 @@ static void runPython(char *par) { } static void cmd_python(struct userrec *u, int idx, char *par) { -// char *result; - PyObject *pobj; - PyErr_Clear(); - - pobj = PyRun_String(par, Py_file_input, pglobals, pglobals); - + PyRun_String(par, Py_file_input, pglobals, pglobals); if (PyErr_Occurred()) { PyErr_Print(); } @@ -315,14 +313,14 @@ static cmd_t mydcc[] = { {NULL, NULL, NULL, NULL} /* Mark end. */ }; -static cmd_t mypy_pub[] = { - {"*", "", py_pub, "python:pub"}, +static cmd_t mypy_pubm[] = { + {"*", "", py_pubm, "python:pubm"}, {NULL, NULL, NULL, NULL} }; static cmd_t mypy_pubm[] = { - {"*", "", py_pubm, "python:pubm"}, - {NULL, NULL, NULL, NULL} + {"*", "", py_join, "python:join"}, + {NULL, NULL, NULL, NULL} }; /*static tcl_cmds mytcl[] = { @@ -353,7 +351,6 @@ static char *python_close() Context; kill_python(); rem_builtins(H_dcc, mydcc); - rem_builtins(H_pub, mypy_pub); rem_builtins(H_pubm, mypy_pubm); // rem_tcl_commands(mytcl); // rem_tcl_ints(my_tcl_ints); @@ -399,7 +396,6 @@ char *python_start(Function *global_funcs) init_python(); /* Add command table to bind list */ - add_builtins(H_pub, mypy_pub); add_builtins(H_pubm, mypy_pubm); add_builtins(H_dcc, mydcc); // add_tcl_commands(mytcl); From 63d5ed946932d27d80099265c34ea84a5be97a18 Mon Sep 17 00:00:00 2001 From: Geo Date: Sun, 31 Jul 2022 10:11:12 -0400 Subject: [PATCH 20/71] fix random leftovers --- src/mod/python.mod/python.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 61a334228..90ced11a8 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -103,11 +103,6 @@ int py_join (char *nick, char *host, char *hand, char *chan) { return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); } - - - return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); -} - int py_msgm (char *nick, char *hand, char *host, char *text) { // struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; char *argv[] = {"msgm", nick, host, hand, text}; @@ -318,7 +313,7 @@ static cmd_t mypy_pubm[] = { {NULL, NULL, NULL, NULL} }; -static cmd_t mypy_pubm[] = { +static cmd_t mypy_join[] = { {"*", "", py_join, "python:join"}, {NULL, NULL, NULL, NULL} }; From 5aefb4d70a0898511206f4910af9538cca838a43 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 31 Jul 2022 17:25:04 +0200 Subject: [PATCH 21/71] new bind syntax, etc. --- scripts/eggdroppy/__init__.py | 3 +- scripts/eggdroppy/binds.py | 125 +++++++++++++++++ scripts/eggdroppy/binds/__init__.py | 2 - scripts/eggdroppy/binds/binds.py | 210 ---------------------------- scripts/eggdroppy/flags.py | 80 +++++++++++ scripts/myscript/myscript.py | 20 ++- src/mod/python.mod/python.c | 1 + 7 files changed, 221 insertions(+), 220 deletions(-) create mode 100644 scripts/eggdroppy/binds.py delete mode 100644 scripts/eggdroppy/binds/__init__.py delete mode 100644 scripts/eggdroppy/binds/binds.py create mode 100644 scripts/eggdroppy/flags.py diff --git a/scripts/eggdroppy/__init__.py b/scripts/eggdroppy/__init__.py index 2b2ed95d5..4709f1df2 100644 --- a/scripts/eggdroppy/__init__.py +++ b/scripts/eggdroppy/__init__.py @@ -1 +1,2 @@ -from .binds import * +from .flags import * +__all__ = ["FlagMatcher", "FlagRecord", "UserFlags"] diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py new file mode 100644 index 000000000..db9dd391c --- /dev/null +++ b/scripts/eggdroppy/binds.py @@ -0,0 +1,125 @@ +import re +import uuid +import sys +from pprint import pprint + +class BindType: +# def __init__(self): + def __init__(self, bindtype): + self.__bindtype = bindtype + self.__binds = {} + + def add(self, callback, flags, mask): + self.__binds.update({uuid.uuid4().hex[:8]:{"callback":callback, "flags":flags, "mask":mask}}) + + def list(self): + return self.__binds + + def __repr__(self): + return f"Bindtype {self.__bindtype}: {repr(self.__binds)}" + +class Binds: + def __init__(self): + self.__binds = {} + self.__binds["pubm"] = BindType("pubm") + self.__binds["join"] = BindType("join") + + def __getattr__(self, name): + return self.__binds[name] + + def all(self): + return self.__binds + + def types(self): + return self.__binds.keys() + + def __repr__(self): + return repr(self.__binds) + +def bindmask2re(mask): + r = '' + for c in mask: + if c == '?': + r += '.' + elif c == '*': + r += '.*' + elif c == '%': + r += '\S*' + elif c == '~': + r += '\s+' + else: + r += re.escape(c) + return re.compile('^' + r + '$') + +def on_pub(flags, nick, user, hand, chan, text): + print("pub bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) + print(__allbinds.bindlist["pub"]) + for i in __allbinds.bindlist["pub"]: + if i["flags"].match(flags) and (i["cmd"] == text.split()[0]): + print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) + i["callback"](nick, user, hand, chan, text.split(" ", 1)[1]) + else: + print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) + return + +def on_pubm(flags, nick, user, hand, chan, text): + pprint(flags) + print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) + for i in __allbinds.bindlist["pubm"]: + print("mask is "+i["mask"]) + if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): + print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) + i["callback"](nick, user, hand, chan, text) + else: + print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) + on_pub(flags, nick, user, hand, chan, text) + return + +def on_msgm(nick, user, hand, text): + print("msgm bind triggered with "+" ".join([nick, user, hand, text])) + for i in __allbinds.bindlist["pubm"]: + print("mask is "+__allbinds.bindlist["msgm"][i]["mask"]) + __allbinds.bindlist["msgm"][i]["callback"](nick, user, hand, text) + return + +def on_join(flags, nick, user, hand, chan): + """This method searches for binds to be triggered when a user joins a channel. + + :param mask: a user hostmask, wildcards supported + :param flags: flags for the user + + :returns: nick hostmask handle channel + """ + print("-={ join bind triggered") + for i in __allbinds.bindlist["join"]: + if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): + print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) + i["callback"](nick, user, hand, chan, text) + else: + print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) + on_pub(flags, nick, user, hand, chan, text) + + +def on_event(bindtype, globalflags, chanflags, botflags, *args): + flags = FlagRecord(globalflags, chanflags, botflags) + for arg in args: + print(arg) + if bindtype == "pub": + on_pub(flags, *args); + if bindtype == "pubm": + on_pubm(flags, *args) + elif bindtype == "msgm": + on_msgm(flags, *args) +# py.putserv("PRIVMSG :"+chan+" you are "+nick+" and you said "+text) + return 0 + +__allbinds = Binds() + +for bindtype in __allbinds.types(): + setattr(sys.modules[__name__], bindtype, getattr(__allbinds, bindtype)) + +def all(): + return __allbinds.all() + +def types(): + return __allbinds.types(i) diff --git a/scripts/eggdroppy/binds/__init__.py b/scripts/eggdroppy/binds/__init__.py deleted file mode 100644 index e3e9efdd1..000000000 --- a/scripts/eggdroppy/binds/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .binds import add, list, FlagMatcher, UserFlags -__all__ = ["add", "list", "FlagMatcher", "UserFlags"] diff --git a/scripts/eggdroppy/binds/binds.py b/scripts/eggdroppy/binds/binds.py deleted file mode 100644 index 5ec886f92..000000000 --- a/scripts/eggdroppy/binds/binds.py +++ /dev/null @@ -1,210 +0,0 @@ -import re -import uuid -from enum import IntFlag -import eggdrop -from pprint import pprint - -class UserFlags(IntFlag): - autoop = a = eggdrop.USER_AUTOOP - bot = b = eggdrop.USER_BOT - common = c = eggdrop.USER_COMMON - deop = d = eggdrop.USER_DEOP - exempt = e = eggdrop.USER_EXEMPT - friend = f = eggdrop.USER_FRIEND - autovoice = g = eggdrop.USER_GVOICE - highlight = h = eggdrop.USER_HIGHLITE - janitor = j = eggdrop.USER_JANITOR - autokick = k = eggdrop.USER_KICK - halfop = l = eggdrop.USER_HALFOP - master = m = eggdrop.USER_MASTER - owner = n = eggdrop.USER_OWNER - op = o = eggdrop.USER_OP - partyline = p = eggdrop.USER_PARTY - devoice = q = eggdrop.USER_QUIET - dehalfop = r = eggdrop.USER_DEHALFOP - botnetmaster = t = eggdrop.USER_BOTMAST - unshared = u = eggdrop.USER_UNSHARED - voice = v = eggdrop.USER_VOICE - wasoptest = w = eggdrop.USER_WASOPTEST - xfer = x = eggdrop.USER_XFER - autohalfop = y = eggdrop.USER_AUTOHALFOP - washalfoptest = z = eggdrop.USER_WASHALFOPTEST - -class FlagRecord: - def __init__(self, globalflags=None, chanflags=None, botflags=None): - self.globl = UserFlags(globalflags) - self.chan = UserFlags(chanflags) - self.bot = UserFlags(botflags) - - def __str__(self): - return 'globl: {}, chan: {}, bot: {}'.format(str(self.globl), str(self.chan), str(self.bot)) - - def __repr__(self): - return repr({'global': repr(self.globl), 'chan': repr(self.chan), 'bot': repr(self.bot)}) - -class FlagMatcher: - def __init__(self, globalflags=None, globalnegflags=None, chanflags=None, channegflags=None, botflags=None, botnegflags=None, requireall=False): - self.globalflags = globalflags - self.globalnegflags = globalnegflags - self.chanflags = chanflags - self.channegflags = channegflags - self.botflags = botflags - self.botnegflags = botnegflags - self.requireall = requireall - - @staticmethod - def flagcheck(posflags, negflags, requireall, flags): - if not requireall: - if posflags and not posflags & flags: - return False - else: - if posflags and not posflags & flags == posflags: - return False - if negflags and negflags & flags: - return False - return True - - def match(self, flags : FlagRecord): - if not FlagMatcher.flagcheck(self.globalflags, self.globalnegflags, self.requireall, flags.globl): - return False - if not FlagMatcher.flagcheck(self.chanflags, self.channegflags, self.requireall, flags.chan): - return False - if not FlagMatcher.flagcheck(self.botflags, self.botnegflags, self.requireall, flags.bot): - return False - return True - - def __repr__(self): - return repr({ - 'globalmatch': repr(self.globalflags), - 'globalnegmatch': repr(self.globalnegflags), - 'chanmatch': repr(self.chanflags), - 'channegmatch': repr(self.channegflags), - 'botmatch': repr(self.botflags), - 'botnegmatch': repr(self.botnegflags), - 'requireall': repr(self.requireall) - }) - -class BindType(dict): -# def __init__(self): - def add(self, callback, flags, mask): - self.update({uuid.uuid4().hex[:8]:{"callback":callback, "flags":flags, "mask":mask}}) - def list(self): - for i in self: - print(self[i]) - -class Binds: - def __init__(self): - pubm = BindType() - join = BindType() - def list(self): - for i in vars(self): - ret = getattr(self, i).list() - if ret: - print(ret) - - -#class Binds: -# def __init__(self): -# self.bindlist = {"pub": [], "msgm": [], "pubm": [], "join": []} -# def list(self, mask=None): -# if not mask: -# result = self.bindlist -# else: -# result = [] -# for i in self.bindlist[mask]: -# result += self.bindlist[mask][i] -# return result - # def prettylist(self, mask=None): -# if not mask: -# for bindtype in self.bindlist: -# for bindentry in self.bindlist[bindtype]: -# print(" "+bindtype+" "+str(bindentry['flags'])+" "+bindentry['cmd']) -# return -# def add(self, bindtype, cmd, flags, mask, callback): -# self.bindlist[bindtype].append({"cmd" : cmd, "callback" : callback, "mask" : mask, "flags" : flags}) -# return - -import re - -def bindmask2re(mask): - r = '' - for c in mask: - if c == '?': - r += '.' - elif c == '*': - r += '.*' - elif c == '%': - r += '\S*' - elif c == '~': - r += '\s+' - else: - r += re.escape(c) - return re.compile('^' + r + '$') - -def on_pub(flags, nick, user, hand, chan, text): - print("pub bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) - print(__allbinds.bindlist["pub"]) - for i in __allbinds.bindlist["pub"]: - if i["flags"].match(flags) and (i["cmd"] == text.split()[0]): - print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) - i["callback"](nick, user, hand, chan, text.split(" ", 1)[1]) - else: - print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) - return - -def on_pubm(flags, nick, user, hand, chan, text): - pprint(flags) - print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) - for i in __allbinds.bindlist["pubm"]: - print("mask is "+i["mask"]) - if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): - print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) - i["callback"](nick, user, hand, chan, text) - else: - print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) - on_pub(flags, nick, user, hand, chan, text) - return - -def on_msgm(nick, user, hand, text): - print("msgm bind triggered with "+" ".join([nick, user, hand, text])) - for i in __allbinds.bindlist["pubm"]: - print("mask is "+__allbinds.bindlist["msgm"][i]["mask"]) - __allbinds.bindlist["msgm"][i]["callback"](nick, user, hand, text) - return - -def on_join(flags, nick, user, hand, chan): - """This method searches for binds to be triggered when a user joins a channel. - - :param mask: a user hostmask, wildcards supported - :param flags: flags for the user - - :returns: nick hostmask handle channel - """ - print("-={ join bind triggered") - for i in __allbinds.bindlist["join"]: - if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): - print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) - i["callback"](nick, user, hand, chan, text) - else: - print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) - on_pub(flags, nick, user, hand, chan, text) - - -def on_event(bindtype, globalflags, chanflags, botflags, *args): - flags = FlagRecord(globalflags, chanflags, botflags) - for arg in args: - print(arg) - if bindtype == "pub": - on_pub(flags, *args); - if bindtype == "pubm": - on_pubm(flags, *args) - elif bindtype == "msgm": - on_msgm(flags, *args) -# py.putserv("PRIVMSG :"+chan+" you are "+nick+" and you said "+text) - return 0 - -__allbinds = Binds() -def add(bindtype, cmd, flags, mask, callback): - __allbinds.add(bindtype, cmd, flags, mask, callback) -def list(mask=None): - return __allbinds.list(mask) diff --git a/scripts/eggdroppy/flags.py b/scripts/eggdroppy/flags.py new file mode 100644 index 000000000..e550f1ac4 --- /dev/null +++ b/scripts/eggdroppy/flags.py @@ -0,0 +1,80 @@ +from enum import IntFlag +import eggdrop + +# TODO: sort these properly +class UserFlags(IntFlag): + n = owner = eggdrop.USER_OWNER + m = master = eggdrop.USER_MASTER + a = autoop = eggdrop.USER_AUTOOP + o = op = eggdrop.USER_OP + g = autovoice = eggdrop.USER_GVOICE + v = voice = eggdrop.USER_VOICE + b = bot = eggdrop.USER_BOT + c = common = eggdrop.USER_COMMON + d = deop = eggdrop.USER_DEOP + e = exempt = eggdrop.USER_EXEMPT + f = friend = eggdrop.USER_FRIEND + h = highlight = eggdrop.USER_HIGHLITE + j = janitor = eggdrop.USER_JANITOR + k = autokick = eggdrop.USER_KICK + l = halfop = eggdrop.USER_HALFOP + p = partyline = eggdrop.USER_PARTY + q = devoice = eggdrop.USER_QUIET + r = dehalfop = eggdrop.USER_DEHALFOP + t = botnetmaster = eggdrop.USER_BOTMAST + u = unshared = eggdrop.USER_UNSHARED + w = wasoptest = eggdrop.USER_WASOPTEST + x = xfer = eggdrop.USER_XFER + y = autohalfop = eggdrop.USER_AUTOHALFOP + z = washalfoptest = eggdrop.USER_WASHALFOPTEST + + def __repr__(self): + if self.value == 0: + return "" + return ''.join(f.name for f in self.__class__ if f.value & self.value) + +class FlagRecord: + def __init__(self, globalflags=None, chanflags=None, botflags=None): + self.globl = UserFlags(globalflags) + self.chan = UserFlags(chanflags) + self.bot = UserFlags(botflags) + + def __str__(self): + return 'globl: {}, chan: {}, bot: {}'.format(str(self.globl), str(self.chan), str(self.bot)) + + def __repr__(self): + return repr({'global': repr(self.globl), 'chan': repr(self.chan), 'bot': repr(self.bot)}) + +class FlagMatcher: + def __init__(self, globalflags=None, globalnegflags=None, chanflags=None, channegflags=None, botflags=None, botnegflags=None, requireall=False): + self.globalflags = globalflags + self.globalnegflags = globalnegflags + self.chanflags = chanflags + self.channegflags = channegflags + self.botflags = botflags + self.botnegflags = botnegflags + self.requireall = requireall + + @staticmethod + def reprflags(pls, mns): + s = "" + if pls: + s += "+" + repr(pls) + if mns: + s += "-" + repr(mns) + return s + + def __repr__(self): + s = "" + sep = "&" if self.requireall else "|" + if not self.globalflags and not self.globalnegflags and not self.chanflags and not self.channegflags and not self.botflags and not self.botnegflags: + return "-" + if self.globalflags or self.globalnegflags: + s += self.reprflags(self.globalflags, self.globalnegflags) + s += sep + if self.chanflags or self.channegflags: + s += self.reprflags(self.chanflags, self.channegflags) + if self.botflags or self.botnegflags: + s += sep + s += self.reprflags(self.botflags, self.botnegflags) + return s diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py index 66177d9fa..a644a5e28 100644 --- a/scripts/myscript/myscript.py +++ b/scripts/myscript/myscript.py @@ -1,33 +1,39 @@ import requests from bs4 import BeautifulSoup -from eggdroppy import binds +from eggdroppy import binds, FlagMatcher, UserFlags as perm from pprint import pprint import eggdrop -def pubGetTitle(nick, user, hand, chan, text): +def pubGetTitle(nick, uhost, hand, chan, text): print(text) reqs = requests.get(text) soup = BeautifulSoup(reqs.text, 'html.parser') eggdrop.putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) -def pubmGetTitle(nick, user, hand, chan, text): +def pubmGetTitle(nick, uhost, hand, chan, text): print(text) reqs = requests.get(text.split()[1]) soup = BeautifulSoup(reqs.text, 'html.parser') eggdrop.putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) +def joinGreetUser(nick, uhost, hand, chan): + eggdrop.putmsg(chan, f"Hello {nick}, welcome to {chan}") + def mypub(nick, user, hand, chan, text): eggdrop.putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) return +def joinGreetOp(nick, uhost, hand, chan, text): + eggdrop.putmsg(chan, f"Hello {nick}, welcome to {chan}, you are an operator") + def mypub2(nick, user, hand, chan, text): print("!!! "+nick+"+ on "+chan+" said "+text+" and is a global +o") - return #binds.add("pubm", "!moo", binds.FlagMatcher(), "*", mypub) #binds.add("pubm", "!moo*", binds.FlagMatcher(globalflags=binds.UserFlags.o), "*", mypub2) #binds.add("pub", "!title", binds.FlagMatcher(), "*", pubGetTitle) #binds.add("pubm", "what*", binds.FlagMatcher(), "*", pubmGetTitle) -binds.join.add(joinGreetUser, binds.FlagMatcher(), "*") -binds.pubm.add(mypub, binds.FlagMatcher(), "*") -pprint(binds.list()) +binds.join.add(joinGreetUser, FlagMatcher(), "*") +binds.join.add(joinGreetOp, FlagMatcher(globalflags=perm.op | perm.master | perm.owner, chanflags=perm.o | perm.m | perm.n), "*") +binds.pubm.add(mypub, FlagMatcher(), "*") +pprint(binds.all()) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 90ced11a8..96fc46e6a 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -392,6 +392,7 @@ char *python_start(Function *global_funcs) /* Add command table to bind list */ add_builtins(H_pubm, mypy_pubm); + add_builtins(H_join, mypy_join); add_builtins(H_dcc, mydcc); // add_tcl_commands(mytcl); // add_tcl_ints(my_tcl_ints); From 04ed6bb43d80a035da37eafab25421386f2d1236 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 31 Jul 2022 18:19:12 +0200 Subject: [PATCH 22/71] fix allbinds access --- scripts/eggdroppy/binds.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index db9dd391c..53423fb16 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -53,8 +53,8 @@ def bindmask2re(mask): def on_pub(flags, nick, user, hand, chan, text): print("pub bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) - print(__allbinds.bindlist["pub"]) - for i in __allbinds.bindlist["pub"]: + print(repr(__allbinds.pub.all())) + for i in __allbinds.pub: if i["flags"].match(flags) and (i["cmd"] == text.split()[0]): print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) i["callback"](nick, user, hand, chan, text.split(" ", 1)[1]) @@ -65,7 +65,7 @@ def on_pub(flags, nick, user, hand, chan, text): def on_pubm(flags, nick, user, hand, chan, text): pprint(flags) print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) - for i in __allbinds.bindlist["pubm"]: + for i in __allbinds.pubm: print("mask is "+i["mask"]) if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) @@ -77,9 +77,9 @@ def on_pubm(flags, nick, user, hand, chan, text): def on_msgm(nick, user, hand, text): print("msgm bind triggered with "+" ".join([nick, user, hand, text])) - for i in __allbinds.bindlist["pubm"]: - print("mask is "+__allbinds.bindlist["msgm"][i]["mask"]) - __allbinds.bindlist["msgm"][i]["callback"](nick, user, hand, text) + for i in __allbinds.pubm: + print("mask is "+__allbinds.msgm[i]["mask"]) + __allbinds.msgm[i]["callback"](nick, user, hand, text) return def on_join(flags, nick, user, hand, chan): @@ -91,7 +91,7 @@ def on_join(flags, nick, user, hand, chan): :returns: nick hostmask handle channel """ print("-={ join bind triggered") - for i in __allbinds.bindlist["join"]: + for i in __allbinds.join: if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) i["callback"](nick, user, hand, chan, text) From 9d91a556d1104f69a89d534cf993978a70f842eb Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 31 Jul 2022 19:18:54 +0200 Subject: [PATCH 23/71] fix stuff --- scripts/eggdroppy/binds.py | 95 ++++++++++++++++++++---------------- scripts/eggdroppy/flags.py | 27 +++++++++- scripts/myscript/myscript.py | 3 +- src/mod/python.mod/python.c | 10 ++-- 4 files changed, 85 insertions(+), 50 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index 53423fb16..cdb46f7e8 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -1,7 +1,8 @@ import re import uuid import sys -from pprint import pprint +from pprint import pprint, pformat +from eggdroppy import FlagRecord class BindType: # def __init__(self): @@ -10,11 +11,14 @@ def __init__(self, bindtype): self.__binds = {} def add(self, callback, flags, mask): - self.__binds.update({uuid.uuid4().hex[:8]:{"callback":callback, "flags":flags, "mask":mask}}) + self.__binds.update({uuid.uuid4().hex[:8]:{"callback":callback, "flags":flags, "mask":mask, "hits":0}}) def list(self): return self.__binds + def all(self): + return self.list() + def __repr__(self): return f"Bindtype {self.__bindtype}: {repr(self.__binds)}" @@ -51,38 +55,47 @@ def bindmask2re(mask): r += re.escape(c) return re.compile('^' + r + '$') -def on_pub(flags, nick, user, hand, chan, text): - print("pub bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) - print(repr(__allbinds.pub.all())) - for i in __allbinds.pub: - if i["flags"].match(flags) and (i["cmd"] == text.split()[0]): - print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) - i["callback"](nick, user, hand, chan, text.split(" ", 1)[1]) - else: - print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) +def flags_ok(bind, realflags): + return bind["flags"].match(realflags) + +def on_pub(flags, nick, uhost, hand, chan, text): + print(f"on_pub({pformat(flags)}, {nick}, {uhost}, {hand}, {chan}, {text.split()[0]}, {text.split(' ', 1)[1]})") + for b in __allbinds.pub.list().values(): + match_flags = flags_ok(b, flags) + match_mask = (b["cmd"] == text.split()[0]) + call_bind = True if match_flags and match_mask else False + print(f" checking against {repr(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") + if call_bind: + b["hits"] += 1 + b["callback"](nick, uhost, hand, chan, text.split(" ", 1)[1]) return -def on_pubm(flags, nick, user, hand, chan, text): - pprint(flags) - print("pubm bind triggered with "+nick+" "+user+" "+hand+" "+chan+" "+text) - for i in __allbinds.pubm: - print("mask is "+i["mask"]) - if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): - print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) - i["callback"](nick, user, hand, chan, text) - else: - print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) - on_pub(flags, nick, user, hand, chan, text) +def on_pubm(flags, nick, uhost, hand, chan, text): + print(f"on_pubm({pformat(flags)}, {nick}, {uhost}, {hand}, {chan}, {text})") + for b in __allbinds.pubm.list().values(): + match_flags = flags_ok(b, flags) + match_mask = bool(bindmask2re(b["mask"]).match(text)) + call_bind = True if match_flags and match_mask else False + print(f" checking against {repr(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") + if call_bind: + b["hits"] += 1 + b["callback"](nick, uhost, hand, chan, text) + on_pub(flags, nick, uhost, hand, chan, text) return -def on_msgm(nick, user, hand, text): - print("msgm bind triggered with "+" ".join([nick, user, hand, text])) - for i in __allbinds.pubm: - print("mask is "+__allbinds.msgm[i]["mask"]) - __allbinds.msgm[i]["callback"](nick, user, hand, text) +def on_msgm(nick, uhost, hand, text): + print(f"on_pubm({pformat(flags)}, {nick}, {uhost}, {hand}, {text})") + for b in __allbinds.msgm.list().values(): + match_flags = flags_ok(b, flags) + match_mask = bool(bindmask2re(b["mask"]).match(text)) + call_bind = True if match_flags and match_mask else False + print(f" checking against {repr(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") + if call_bind: + b["hits"] += 1 + b["callback"](nick, uhost, hand, text) return -def on_join(flags, nick, user, hand, chan): +def on_join(flags, nick, uhost, hand, chan): """This method searches for binds to be triggered when a user joins a channel. :param mask: a user hostmask, wildcards supported @@ -90,27 +103,25 @@ def on_join(flags, nick, user, hand, chan): :returns: nick hostmask handle channel """ - print("-={ join bind triggered") - for i in __allbinds.join: - if i["flags"].match(flags) and bindmask2re(i["mask"]).match(text): - print("flagmatcher {} matches flag record {}".format(repr(i["flags"]), repr(flags))) - i["callback"](nick, user, hand, chan, text) - else: - print("flagmatcher {} does not match flag record {}".format(repr(i["flags"]), repr(flags))) - on_pub(flags, nick, user, hand, chan, text) - + print(f"on_join({pformat(flags)}, {nick}, {uhost}, {hand}, {chan})") + for b in __allbinds.join.list().values(): + match_flags = flags_ok(b, flags) + match_mask = bool(bindmask2re(b["mask"]).match(f"{nick}!{uhost}")) + call_bind = True if match_flags and match_mask else False + print(f" checking against {repr(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") + if call_bind: + b["hits"] += 1 + b["callback"](nick, uhost, hand, chan) def on_event(bindtype, globalflags, chanflags, botflags, *args): flags = FlagRecord(globalflags, chanflags, botflags) - for arg in args: - print(arg) - if bindtype == "pub": - on_pub(flags, *args); + print(f"on_event({bindtype}, {repr(globalflags)}, {repr(chanflags)}, {repr(botflags)}, {pformat(args)}") if bindtype == "pubm": on_pubm(flags, *args) elif bindtype == "msgm": on_msgm(flags, *args) -# py.putserv("PRIVMSG :"+chan+" you are "+nick+" and you said "+text) + elif bindtype == "join": + on_join(flags, *args) return 0 __allbinds = Binds() diff --git a/scripts/eggdroppy/flags.py b/scripts/eggdroppy/flags.py index e550f1ac4..b6ed22a9d 100644 --- a/scripts/eggdroppy/flags.py +++ b/scripts/eggdroppy/flags.py @@ -1,4 +1,5 @@ from enum import IntFlag +from pprint import pprint import eggdrop # TODO: sort these properly @@ -30,7 +31,7 @@ class UserFlags(IntFlag): def __repr__(self): if self.value == 0: - return "" + return "-" return ''.join(f.name for f in self.__class__ if f.value & self.value) class FlagRecord: @@ -43,7 +44,7 @@ def __str__(self): return 'globl: {}, chan: {}, bot: {}'.format(str(self.globl), str(self.chan), str(self.bot)) def __repr__(self): - return repr({'global': repr(self.globl), 'chan': repr(self.chan), 'bot': repr(self.bot)}) + return f"{repr(self.globl)}|{repr(self.chan)}|{repr(self.bot)}" class FlagMatcher: def __init__(self, globalflags=None, globalnegflags=None, chanflags=None, channegflags=None, botflags=None, botnegflags=None, requireall=False): @@ -78,3 +79,25 @@ def __repr__(self): s += sep s += self.reprflags(self.botflags, self.botnegflags) return s + + @staticmethod + def flagcheck(posflags, negflags, requireall, flags): + if not requireall: + if posflags and not posflags & flags: + return False + else: + if posflags and not posflags & flags == posflags: + return False + if negflags and negflags & flags: + return False + return True + + def match(self, flags : FlagRecord): + if not FlagMatcher.flagcheck(self.globalflags, self.globalnegflags, self.requireall, flags.globl): + return False + if not FlagMatcher.flagcheck(self.chanflags, self.channegflags, self.requireall, flags.chan): + return False + if not FlagMatcher.flagcheck(self.botflags, self.botnegflags, self.requireall, flags.bot): + return False + return True + diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py index a644a5e28..fedd26c90 100644 --- a/scripts/myscript/myscript.py +++ b/scripts/myscript/myscript.py @@ -17,13 +17,14 @@ def pubmGetTitle(nick, uhost, hand, chan, text): eggdrop.putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) def joinGreetUser(nick, uhost, hand, chan): + print("JOIN BIND TRIGGERED SUCCESSFULLY") eggdrop.putmsg(chan, f"Hello {nick}, welcome to {chan}") def mypub(nick, user, hand, chan, text): eggdrop.putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) return -def joinGreetOp(nick, uhost, hand, chan, text): +def joinGreetOp(nick, uhost, hand, chan): eggdrop.putmsg(chan, f"Hello {nick}, welcome to {chan}, you are an operator") def mypub2(nick, user, hand, chan, text): diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 96fc46e6a..3ea6f4ac7 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -66,7 +66,7 @@ int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { struct userrec *u; struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; - if (!(ch = findchan(chan))) { + if (!(ch = findchan_by_dname(chan))) { putlog(LOG_MISC, "*", "Python: Cannot find pubm channel %s", chan); return 1; } @@ -78,7 +78,7 @@ int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { putlog(LOG_MISC, "*", "Python: Cannot convert pubm arguments"); return 1; } - return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); + return runPythonPyArgs("eggdroppy.binds", "on_event", pArgs); } int py_join (char *nick, char *host, char *hand, char *chan) { @@ -88,7 +88,7 @@ int py_join (char *nick, char *host, char *hand, char *chan) { struct userrec *u; struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; - if (!(ch = findchan(chan))) { + if (!(ch = findchan_by_dname(chan))) { putlog(LOG_MISC, "*", "Python: Cannot find pubm channel %s", chan); return 1; } @@ -100,14 +100,14 @@ int py_join (char *nick, char *host, char *hand, char *chan) { putlog(LOG_MISC, "*", "Python: Cannot convert join arguments"); return 1; } - return runPythonPyArgs("eggdroppy.binds.binds", "on_event", pArgs); + return runPythonPyArgs("eggdroppy.binds", "on_event", pArgs); } int py_msgm (char *nick, char *hand, char *host, char *text) { // struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; char *argv[] = {"msgm", nick, host, hand, text}; - runPythonArgs("eggdroppy.binds.binds", "on_event", ARRAYCOUNT(argv), argv); + runPythonArgs("eggdroppy.binds", "on_event", ARRAYCOUNT(argv), argv); return 0; } From 943992bc65049799f2def79a629464c2f3f8ce6b Mon Sep 17 00:00:00 2001 From: Geo Date: Sun, 31 Jul 2022 22:21:35 -0400 Subject: [PATCH 24/71] Documentation samples --- scripts/eggdroppy/binds.py | 41 +++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index 53423fb16..a551abf57 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -4,21 +4,50 @@ from pprint import pprint class BindType: -# def __init__(self): + """ A BindType is an event that can trigger an Eggdrop response + + Each event that Eggdrop refers to, called a bind, requires a :class:`BindType` to be loaded by the + :class:`Binds` class. + + Args: + bindtype (string): A string representing one of the core Eggdrop bind types + """ def __init__(self, bindtype): self.__bindtype = bindtype self.__binds = {} def add(self, callback, flags, mask): + """ Register a new bind event + + Adds a new :class:`BindType` attribute to a :class:`Bind` object. + + Args: + callback (method): The name of the function you wish to call when the event is triggered + flags (object): a flag object, we'll figure this out soon + mask (str): mask or command or something, maybe find a better word here + """ self.__binds.update({uuid.uuid4().hex[:8]:{"callback":callback, "flags":flags, "mask":mask}}) def list(self): + """ List all binds of the ``bindtype`` + + Returns: + list: A list of binds, in the format {A B C D} + """ return self.__binds def __repr__(self): return f"Bindtype {self.__bindtype}: {repr(self.__binds)}" class Binds: + """ A :class:`Binds` object holds a collection of :class:`BindTypes` objects + + All binds that are added to Eggdrop are collected and accessed through a :class:`Binds` object. Each + event type that Eggdrop reacts to is added to the :class:`Binds` object as a bind via a + :class:`BindTypes` object. + + Args: None + """ def __init__(self): self.__binds = {} self.__binds["pubm"] = BindType("pubm") @@ -28,9 +57,19 @@ def __getattr__(self, name): return self.__binds[name] def all(self): + """ Lists all binds registered with the object + + Returns: + list: A list, or maybe a dict? of all binds + """ return self.__binds def types(self): + """ Lists all :class:`BindType` attributes added to the :class:`Binds` object + + Returns: + list: maybe a list? of attributes + """ return self.__binds.keys() def __repr__(self): From 9d50a8ab20a8f869ecbbe9813fcfcc9a67e605c2 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Mon, 1 Aug 2022 17:35:31 +0200 Subject: [PATCH 25/71] Add ircsend, putmsg, puthelp, putserv, etc. --- scripts/eggdroppy/__init__.py | 2 +- scripts/myscript/myscript.py | 13 ++++++------ src/mod/python.mod/pycmds.c | 40 ++++++++++++++--------------------- 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/scripts/eggdroppy/__init__.py b/scripts/eggdroppy/__init__.py index 4709f1df2..bbaa72631 100644 --- a/scripts/eggdroppy/__init__.py +++ b/scripts/eggdroppy/__init__.py @@ -1,2 +1,2 @@ from .flags import * -__all__ = ["FlagMatcher", "FlagRecord", "UserFlags"] +from .cmds import * diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py index fedd26c90..25e35358b 100644 --- a/scripts/myscript/myscript.py +++ b/scripts/myscript/myscript.py @@ -1,31 +1,30 @@ import requests from bs4 import BeautifulSoup -from eggdroppy import binds, FlagMatcher, UserFlags as perm +from eggdroppy import binds, FlagMatcher, UserFlags as perm, putmsg from pprint import pprint -import eggdrop def pubGetTitle(nick, uhost, hand, chan, text): print(text) reqs = requests.get(text) soup = BeautifulSoup(reqs.text, 'html.parser') - eggdrop.putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) + putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) def pubmGetTitle(nick, uhost, hand, chan, text): print(text) reqs = requests.get(text.split()[1]) soup = BeautifulSoup(reqs.text, 'html.parser') - eggdrop.putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) + putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) def joinGreetUser(nick, uhost, hand, chan): print("JOIN BIND TRIGGERED SUCCESSFULLY") - eggdrop.putmsg(chan, f"Hello {nick}, welcome to {chan}") + putmsg(chan, f"Hello {nick}, welcome to {chan}") def mypub(nick, user, hand, chan, text): - eggdrop.putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) + putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) return def joinGreetOp(nick, uhost, hand, chan): - eggdrop.putmsg(chan, f"Hello {nick}, welcome to {chan}, you are an operator") + putmsg(chan, f"Hello {nick}, welcome to {chan}, you are an operator") def mypub2(nick, user, hand, chan, text): print("!!! "+nick+"+ on "+chan+" said "+text+" and is a global +o") diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index a3349f1b7..4044d0544 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -16,41 +16,23 @@ static PyObject *testcmd(PyObject *self, PyObject *args) { return testdict; } -static PyObject *py_putmsg(PyObject *self, PyObject *args) { - char *chan = 0, *msg = 0, *p; +static PyObject *py_ircsend(PyObject *self, PyObject *args) { + char *text; + int queuenum; - if(!PyArg_ParseTuple(args, "ss", &chan, &msg)) { -// PyErr_SetString(PyExc_SyntaxError, "wrong number of args"); + if(!PyArg_ParseTuple(args, "si", &text, &queuenum)) { PyErr_SetString(EggdropError, "wrong number of args"); return NULL; } -// BADARGS(2, 3, " text ?options?"); - -// if ((argc == 3) && strcasecmp(argv[2], "-next") && -// strcasecmp(argv[2], "-normal")) { -// Tcl_AppendResult(irp, "unknown putserv option: should be one of: ", -// "-normal -next", NULL); -// return TCL_ERROR; -// } - - p = strchr(chan, '\n'); - if (p != NULL) - *p = 0; - p = strchr(chan, '\r'); - if (p != NULL) - *p = 0; -// if (!strcasecmp(t, "-next")) -// dprintf(DP_SERVER_NEXT, "%s\n", s); -// else - dprintf(DP_SERVER, "PRIVMSG %s :%s\n", chan, msg); + dprintf(queuenum, "%s\n", text); Py_RETURN_NONE; } static PyMethodDef MyPyMethods[] = { {"testcmd", testcmd, METH_VARARGS, "A test dict"}, - {"putmsg", py_putmsg, METH_VARARGS, "Send message to server"}, + {"ircsend", py_ircsend, METH_VARARGS, "Send message to server"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; @@ -104,5 +86,15 @@ PyMODINIT_FUNC PyInit_eggdrop(void) { PyModule_AddIntConstant(pymodobj, "USER_AUTOHALFOP", 0x01000000); PyModule_AddIntConstant(pymodobj, "USER_WASHALFOPTEST", 0x02000000); + PyModule_AddIntConstant(pymodobj, "QUEUE_STDOUT", 0x7FF1); + PyModule_AddIntConstant(pymodobj, "QUEUE_LOG", 0x7FF2); + PyModule_AddIntConstant(pymodobj, "QUEUE_SERVER", 0x7FF3); + PyModule_AddIntConstant(pymodobj, "QUEUE_HELP", 0x7FF4); + PyModule_AddIntConstant(pymodobj, "QUEUE_STDERR", 0x7FF5); + PyModule_AddIntConstant(pymodobj, "QUEUE_MODE", 0x7FF6); + PyModule_AddIntConstant(pymodobj, "QUEUE_MODE_NEXT", 0x7FF7); + PyModule_AddIntConstant(pymodobj, "QUEUE_SERVER_NEXT", 0x7FF8); + PyModule_AddIntConstant(pymodobj, "QUEUE_HELP_NEXT", 0x7FF9); + return pymodobj; } From 3744bf5c39fcb27c6d77d09a62819d83f4902b83 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Tue, 2 Aug 2022 07:41:27 +0200 Subject: [PATCH 26/71] Add missing file --- scripts/eggdroppy/cmds.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 scripts/eggdroppy/cmds.py diff --git a/scripts/eggdroppy/cmds.py b/scripts/eggdroppy/cmds.py new file mode 100644 index 000000000..d86da1664 --- /dev/null +++ b/scripts/eggdroppy/cmds.py @@ -0,0 +1,39 @@ +from enum import IntEnum +import eggdrop + +class IRCQueue(IntEnum): + NOQUEUE = 0 + SERVER = eggdrop.QUEUE_SERVER + HELP = eggdrop.QUEUE_HELP + QUICK = MODE = eggdrop.QUEUE_MODE + +def ircsend(text, queue = IRCQueue.SERVER, make_first=False): + if queue == IRCQueue.QUICK and make_first: + queuenum = eggdrop.QUEUE_MODE_NEXT + elif queue == IRCQueue.SERVER and make_first: + queuenum = eggdrop.QUEUE_SERVER_NEXT + elif queue == IRCQueue.HELP and make_first: + queuenum = eggdrop.QUEUE_HELP_NEXT + elif queue == IRCQueue.NOQUEUE: + raise Exception("Not implemented yet") + eggdrop.ircsend(text.rstrip('\r\n'), queue) + +# unnecessary shorthands (?) +def putserv(text, make_first=False): + ircsend(text, queue=IRCQueue.SERVER, make_first=make_first) + +def puthelp(text, make_first=False): + ircsend(text, queue=IRCQueue.HELP, make_first=make_first) + +def putquick(text, make_first=False): + ircsend(text, queue=IRCQueue.MODE, make_first=make_first) + +# useful shorthands +def putmsg(dst, text): + for line in text.split('\n'): + ircsend(f"PRIVMSG {dst} :{line}") + +def putnotc(dst, text): + for line in text.split('\n'): + ircsend(f"NOTICE {dst} :{line}") + From c2229dbcc6910c950e152141c38ced6247611f1e Mon Sep 17 00:00:00 2001 From: Geo Date: Thu, 4 Aug 2022 15:54:30 -0400 Subject: [PATCH 27/71] start pybinds --- scripts/eggdroppy/binds.py | 14 ++++++++++++-- src/mod/python.mod/python.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index 3b831c403..e7331bdf0 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -40,7 +40,7 @@ def list(self): def all(self): return self.list() - def __repr__(self): + def __str__(self): return f"Bindtype {self.__bindtype}: {repr(self.__binds)}" class Binds: @@ -172,4 +172,14 @@ def all(): return __allbinds.all() def types(): - return __allbinds.types(i) + return __allbinds.types() + +def print_all(): + print("\n{0: <8} | {1: <18} | {2: <12} | {3: <24} | {4}".format('ID', 'function', 'flags', 'mask', 'hits')) + for i in types(): + print("-"*78) + print(f'{i:<8}') + print("-"*78) + for j in __allbinds.all()[i].all().keys(): + print(f'{j} | {__allbinds.all()[i].all()[j]["callback"].__name__:<18} | {str(__allbinds.all()[i].all()[j]["flags"]):<12} | {__allbinds.all()[i].all()[j]["mask"]:<24} | {__allbinds.all()[i].all()[j]["hits"]:<4}') + print("-"*78) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 3ea6f4ac7..7b222496c 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -279,7 +279,7 @@ static void cmd_pysource(struct userrec *u, int idx, char *par) { } static void cmd_pybinds(struct userrec *u, int idx, char *par) { - cmd_pyexpr(u, idx, "binds.list()"); + runPython("eggdroppy.binds print_all"); return; } From ababec2c7b7ee71d46383c5e3a11e07b7a41fc9b Mon Sep 17 00:00:00 2001 From: Geo Date: Thu, 4 Aug 2022 23:19:48 -0400 Subject: [PATCH 28/71] Add delete command for binds --- scripts/eggdroppy/binds.py | 18 ++++++++++++------ src/mod/python.mod/python.c | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index e7331bdf0..faddece1c 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -29,6 +29,11 @@ def add(self, callback, flags, mask): """ self.__binds.update({uuid.uuid4().hex[:8]:{"callback":callback, "flags":flags, "mask":mask, "hits":0}}) + def delete(self, bindid): + print(self.__binds) + if bindid in self.__binds: + self.__binds.pop(bindid) + def list(self): """ List all binds of the ``bindtype`` @@ -175,11 +180,12 @@ def types(): return __allbinds.types() def print_all(): - print("\n{0: <8} | {1: <18} | {2: <12} | {3: <24} | {4}".format('ID', 'function', 'flags', 'mask', 'hits')) + print("{0: <8} | {1: <18} | {2: <12} | {3: <24} | {4}".format('ID', 'function', 'flags', 'mask', 'hits')) for i in types(): - print("-"*78) - print(f'{i:<8}') - print("-"*78) - for j in __allbinds.all()[i].all().keys(): - print(f'{j} | {__allbinds.all()[i].all()[j]["callback"].__name__:<18} | {str(__allbinds.all()[i].all()[j]["flags"]):<12} | {__allbinds.all()[i].all()[j]["mask"]:<24} | {__allbinds.all()[i].all()[j]["hits"]:<4}') + if __allbinds.all()[i].all(): + print("-"*78) + print(f'{i:<8}') + print("-"*78) + for j in __allbinds.all()[i].all().keys(): + print(f'{j} | {__allbinds.all()[i].all()[j]["callback"].__name__:<18} | {str(__allbinds.all()[i].all()[j]["flags"]):<12} | {__allbinds.all()[i].all()[j]["mask"]:<24} | {__allbinds.all()[i].all()[j]["hits"]:<4}') print("-"*78) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 7b222496c..ec5de08b8 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -279,7 +279,7 @@ static void cmd_pysource(struct userrec *u, int idx, char *par) { } static void cmd_pybinds(struct userrec *u, int idx, char *par) { - runPython("eggdroppy.binds print_all"); + cmd_pyexpr(u, idx, "eggdroppy.binds.print_all()"); return; } From 9fdf80a3ff6c3410c7303a9e4a1672cb3cdadfae Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sat, 6 Aug 2022 14:51:26 +0200 Subject: [PATCH 29/71] Python build update --- aclocal.m4 | 3 + configure | 50 ++++++++++++- configure.ac | 4 + m4/python.m4 | 53 +++++++++++++ src/mod/compress.mod/configure | 2 +- src/mod/dns.mod/Makefile.in | 3 +- src/mod/dns.mod/configure | 2 +- src/mod/pbkdf2.mod/Makefile | 11 ++- src/mod/python.mod/{Makefile => Makefile.in} | 14 +++- src/mod/python.mod/configure.ac | 78 ++++++++++++++++++++ 10 files changed, 210 insertions(+), 10 deletions(-) create mode 100644 m4/python.m4 rename src/mod/python.mod/{Makefile => Makefile.in} (62%) create mode 100644 src/mod/python.mod/configure.ac diff --git a/aclocal.m4 b/aclocal.m4 index fc810bc45..536393305 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,6 +20,9 @@ dnl dnl Load tcl macros builtin(include,m4/tcl.m4) +dnl Load python macros +builtin(include,m4/python.m4) + dnl Load gnu autoconf archive macros builtin(include,m4/ax_create_stdint_h.m4) builtin(include,m4/ax_lib_socket_nsl.m4) diff --git a/configure b/configure index ecfb818de..e1bc30382 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac bc41b3ea. +# From configure.ac 3744bf5c. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for Eggdrop 1.9.3. # @@ -632,6 +632,8 @@ EGG_CROSS_COMPILING MOD_UPDIR DEST EGGVERSION +egg_with_python_config +egg_enable_python SSL_LIBS SSL_INCLUDES DEBCFLGS @@ -774,6 +776,8 @@ enable_tls with_sslinc with_ssllib enable_tdns +enable_python +with_python_config ' ac_precious_vars='build_alias host_alias @@ -1434,6 +1438,9 @@ Optional Features and Packages: --with-sslinc=PATH Path to OpenSSL headers --with-ssllib=PATH Path to OpenSSL libraries --disable-tdns disable threaded DNS core + --enable-python enable Python support (autodetect) + --disable-python disable Python support + --with-python-config=PATH Path to python-config Some influential environment variables: CC C compiler command @@ -9954,6 +9961,47 @@ $as_echo "#define EGG_TDNS 1" >>confdefs.h fi +# Check for Python + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile the Python module" >&5 +$as_echo_n "checking whether to compile the Python module... " >&6; } + # Check whether --enable-python was given. +if test "${enable_python+set}" = set; then : + enableval=$enable_python; egg_enable_python="$enableval" +fi + + # Check whether --enable-python was given. +if test "${enable_python+set}" = set; then : + enableval=$enable_python; egg_enable_python="$enableval" +else + egg_enable_python="autodetect" +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $egg_enable_python" >&5 +$as_echo "$egg_enable_python" >&6; } + + + + +# Check whether --with-python-config was given. +if test "${with_python_config+set}" = set; then : + withval=$with_python_config; + if test "x$enable_python" != "xno"; then + if test -d "$withval" || test -x "$withval"; then + egg_with_python_config="$withval" + else + egg_with_python_config="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Invalid path to python-config. $withval is not a directory and not an executable." >&5 +$as_echo "$as_me: WARNING: Invalid path to python-config. $withval is not a directory and not an executable." >&2;} + fi + fi + +fi + + + + # Substitute Makefile variables. diff --git a/configure.ac b/configure.ac index 96e906230..0e5620af3 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,10 @@ EGG_TLS_DETECT # Threaded DNS core EGG_TDNS_ENABLE +# Check for Python +EGG_PYTHON_ENABLE +EGG_PYTHON_WITHCONFIG + # Substitute Makefile variables. EGG_SUBST_EGGVERSION diff --git a/m4/python.m4 b/m4/python.m4 new file mode 100644 index 000000000..84dc338ba --- /dev/null +++ b/m4/python.m4 @@ -0,0 +1,53 @@ +dnl python.m4 -- Autoconf macros to compile python.mod +dnl +dnl Copyright (c) 2022 - 2022 Eggheads Development Team +dnl +dnl This program is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU General Public License +dnl as published by the Free Software Foundation; either version 2 +dnl of the License, or (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +dnl + +dnl EGG_PYTHON_ENABLE +dnl +AC_DEFUN([EGG_PYTHON_ENABLE], +[ + AC_MSG_CHECKING([whether to compile the Python module]) + AC_ARG_ENABLE(python, + [ --enable-python enable Python support (autodetect)], + [egg_enable_python="$enableval"]) + AC_ARG_ENABLE(python, + [ --disable-python disable Python support], [egg_enable_python="$enableval"], + [egg_enable_python="autodetect"]) + + AC_MSG_RESULT([$egg_enable_python]) + AC_SUBST(egg_enable_python) +]) + + +dnl EGG_PYTHON_WITHCONFIG +dnl +AC_DEFUN(EGG_PYTHON_WITHCONFIG, +[ + AC_ARG_WITH(python-config, [ --with-python-config=PATH Path to python-config], [ + if test "x$enable_python" != "xno"; then + if test -d "$withval" || test -x "$withval"; then + egg_with_python_config="$withval" + else + egg_with_python_config="no" + AC_MSG_WARN([Invalid path to python-config. $withval is not a directory and not an executable.]) + fi + fi + ]) + AC_SUBST(egg_with_python_config) +]) + diff --git a/src/mod/compress.mod/configure b/src/mod/compress.mod/configure index 356916e6d..19f70a217 100755 --- a/src/mod/compress.mod/configure +++ b/src/mod/compress.mod/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac bc41b3ea. +# From configure.ac 3744bf5c. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for Eggdrop Compress Module 1.9.3. # diff --git a/src/mod/dns.mod/Makefile.in b/src/mod/dns.mod/Makefile.in index bba72091b..9202f97be 100644 --- a/src/mod/dns.mod/Makefile.in +++ b/src/mod/dns.mod/Makefile.in @@ -42,5 +42,4 @@ distclean: clean ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \ ../../../src/compat/gethostbyname2.h \ ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \ - ../../../src/mod/modvals.h ../../../src/tandem.h .././dns.mod/dns.h \ - .././dns.mod/coredns.c + ../../../src/mod/modvals.h ../../../src/tandem.h diff --git a/src/mod/dns.mod/configure b/src/mod/dns.mod/configure index c14fa7a18..7a561b614 100755 --- a/src/mod/dns.mod/configure +++ b/src/mod/dns.mod/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac bc41b3ea. +# From configure.ac 3744bf5c. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for Eggdrop DNS Module 1.9.3. # diff --git a/src/mod/pbkdf2.mod/Makefile b/src/mod/pbkdf2.mod/Makefile index b28559065..24389d858 100644 --- a/src/mod/pbkdf2.mod/Makefile +++ b/src/mod/pbkdf2.mod/Makefile @@ -28,4 +28,13 @@ clean: distclean: clean #safety hash -../pbkdf2.o: .././pbkdf2.mod/pbkdf2.c +../pbkdf2.o: .././pbkdf2.mod/pbkdf2.c ../../../src/mod/module.h \ + ../../../src/main.h ../../../config.h ../../../eggint.h ../../../lush.h \ + ../../../src/lang.h ../../../src/eggdrop.h ../../../src/compat/in6.h \ + ../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \ + ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \ + ../../../src/compat/compat.h ../../../src/compat/base64.h \ + ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \ + ../../../src/compat/gethostbyname2.h \ + ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \ + ../../../src/mod/modvals.h ../../../src/tandem.h diff --git a/src/mod/python.mod/Makefile b/src/mod/python.mod/Makefile.in similarity index 62% rename from src/mod/python.mod/Makefile rename to src/mod/python.mod/Makefile.in index 601214a15..297fbafbe 100644 --- a/src/mod/python.mod/Makefile +++ b/src/mod/python.mod/Makefile.in @@ -1,7 +1,8 @@ # Makefile for src/mod/python.mod/ srcdir = . - +PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_LDFLAGS = @PYTHON_CFLAGS@ doofus: @echo "" && \ @@ -14,10 +15,10 @@ static: ../python.o modules: ../../../python.$(MOD_EXT) ../python.o: - $(CC) $(CFLAGS) $(CPPFLAGS) `python3-config --cflags --embed` `python3-config --embed --ldflags` -DMAKING_MODS -c $(srcdir)/python.c && mv -f python.o ../ + $(CC) $(CFLAGS) $(CPPFLAGS) $(PYTHON_CFLAGS) -DMAKING_MODS -c $(srcdir)/python.c && mv -f python.o ../ ../../../python.$(MOD_EXT): ../python.o - $(LD) $(CFLAGS) -o ../../../python.$(MOD_EXT) ../python.o `python3-config --cflags --embed` `python3-config --embed --ldflags` $(XLIBS) $(MODULE_XLIBS) && $(STRIP) ../../../python.$(MOD_EXT) + $(LD) $(CFLAGS) -o ../../../python.$(MOD_EXT) ../python.o $(PYTHON_CFLAGS) $(PYTHON_LDFLAGS) $(XLIBS) $(MODULE_XLIBS) && $(STRIP) ../../../python.$(MOD_EXT) depend: $(CC) $(CFLAGS) -MM $(srcdir)/python.c -MT ../python.o > .depend @@ -26,6 +27,8 @@ clean: @rm -f .depend *.o *.$(MOD_EXT) *~ distclean: clean + @rm -f Makefile config.cache config.log config.status + @rm -rf autom4te.cache #safety hash ../python.o: .././python.mod/python.c ../../../src/mod/module.h \ @@ -37,4 +40,7 @@ distclean: clean ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \ ../../../src/compat/gethostbyname2.h \ ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \ - ../../../src/mod/modvals.h ../../../src/tandem.h + ../../../src/mod/modvals.h ../../../src/tandem.h \ + ../../../src/mod/irc.mod/irc.h ../../../src/mod/server.mod/server.h \ + ../../../src/mod/python.mod/python.h \ + ../../../src/mod/python.mod/pycmds.c diff --git a/src/mod/python.mod/configure.ac b/src/mod/python.mod/configure.ac new file mode 100644 index 000000000..b52a686b3 --- /dev/null +++ b/src/mod/python.mod/configure.ac @@ -0,0 +1,78 @@ +dnl configure.ac: this file is processed by autoconf to produce ./configure. + +AC_PREREQ(2.69) + +sinclude(../eggmod.m4) +builtin(include,../../../m4/python.m4) + +AC_INIT([Eggdrop Python Module],[1.9.3],[bugs@eggheads.org]) + +AC_CONFIG_SRCDIR(python.c) +AC_CONFIG_AUX_DIR(../../../misc) + +AC_COPYRIGHT([Copyright (C) 1999 - 2022 Eggheads Development Team]) +AC_REVISION([m4_esyscmd([../../../misc/getcommit])]) + +AC_PROG_FGREP +EGG_PYTHON_ENABLE +EGG_PYTHON_WITHCONFIG + +python_avail="false" + +if test "x$egg_enable_python" != "xno"; then + if test "x$egg_with_python_config" = "x"; then + AC_PATH_PROGS([python_config_bin], [python3-config python-config]) + else + if test -d "$egg_with_python_config"; then + AC_MSG_NOTICE([Checking for python-config binaries in $egg_with_python_config]) + AC_PATH_PROGS([python_config_bin], [python3-config python-config], [], [$egg_with_python_config]) + else + if test -x "$egg_with_python_config"; then + python_config_bin="$egg_with_python_config" + else + AC_MSG_WARN([Specified --with-python-config=$egg_with_python_config does not exist.]) + fi + fi + fi +else + AC_MSG_NOTICE([Python module disabled.]) +fi + +if test "x$python_config_bin" != "x"; then + AC_MSG_CHECKING([whether python-config supports --embed]) + AS_IF([$python_config_bin --help | $FGREP -q -- --embed], [ + AC_SUBST([PYTHON_CONFIG_ARGS], "--embed") + AC_MSG_RESULT([yes]) + ], [ + AC_SUBST([PYTHON_CONFIG_ARGS], "") + AC_MSG_RESULT([no]) + ]) + + AC_MSG_CHECKING([for python C flags]) + PYTHON_CFLAGS=`$python_config_bin $PYTHON_CONFIG_ARGS --cflags` + AC_MSG_RESULT([$PYTHON_CFLAGS]) + AC_SUBST(PYTHON_CFLAGS) + + AC_MSG_CHECKING([for python LD flags]) + PYTHON_LDFLAGS=`$python_config_bin $PYTHON_CONFIG_ARGS --ldflags` + AC_MSG_RESULT([$PYTHON_LDFLAGS]) + AC_SUBST(PYTHON_LDFLAGS) + python_avail="true" +fi + +# Disable the module +if test "x$python_avail" = "xfalse"; then + if test "x$egg_enable_python" != "xno"; then + cat >&2 < Date: Sat, 6 Aug 2022 14:56:03 +0200 Subject: [PATCH 30/71] Run autotools --- configure | 2 +- src/mod/compress.mod/configure | 2 +- src/mod/dns.mod/configure | 2 +- src/mod/python.mod/configure | 3232 ++++++++++++++++++++++++++++++++ 4 files changed, 3235 insertions(+), 3 deletions(-) create mode 100755 src/mod/python.mod/configure diff --git a/configure b/configure index e1bc30382..1280d6640 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac 3744bf5c. +# From configure.ac 9fdf80a3. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for Eggdrop 1.9.3. # diff --git a/src/mod/compress.mod/configure b/src/mod/compress.mod/configure index 19f70a217..9019d856b 100755 --- a/src/mod/compress.mod/configure +++ b/src/mod/compress.mod/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac 3744bf5c. +# From configure.ac 9fdf80a3. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for Eggdrop Compress Module 1.9.3. # diff --git a/src/mod/dns.mod/configure b/src/mod/dns.mod/configure index 7a561b614..631dace75 100755 --- a/src/mod/dns.mod/configure +++ b/src/mod/dns.mod/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac 3744bf5c. +# From configure.ac 9fdf80a3. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for Eggdrop DNS Module 1.9.3. # diff --git a/src/mod/python.mod/configure b/src/mod/python.mod/configure new file mode 100755 index 000000000..40bd0c84a --- /dev/null +++ b/src/mod/python.mod/configure @@ -0,0 +1,3232 @@ +#! /bin/sh +# From configure.ac 9fdf80a3. +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.69 for Eggdrop Python Module 1.9.3. +# +# Report bugs to . +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +# +# Copyright (C) 1999 - 2022 Eggheads Development Team +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and bugs@eggheads.org +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='Eggdrop Python Module' +PACKAGE_TARNAME='eggdrop-python-module' +PACKAGE_VERSION='1.9.3' +PACKAGE_STRING='Eggdrop Python Module 1.9.3' +PACKAGE_BUGREPORT='bugs@eggheads.org' +PACKAGE_URL='' + +ac_unique_file="python.c" +ac_subst_vars='LTLIBOBJS +LIBOBJS +PYTHON_LDFLAGS +PYTHON_CFLAGS +PYTHON_CONFIG_ARGS +python_config_bin +egg_with_python_config +egg_enable_python +FGREP +GREP +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +runstatedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_python +with_python_config +' + ac_precious_vars='build_alias +host_alias +target_alias' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir runstatedir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures Eggdrop Python Module 1.9.3 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root + [DATAROOTDIR/doc/eggdrop-python-module] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of Eggdrop Python Module 1.9.3:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-python enable Python support (autodetect) + --disable-python disable Python support + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-python-config=PATH Path to python-config + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +Eggdrop Python Module configure 1.9.3 +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. + +Copyright (C) 1999 - 2022 Eggheads Development Team +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by Eggdrop Python Module $as_me 1.9.3, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + +ac_aux_dir= +for ac_dir in ../../../misc "$srcdir"/../../../misc; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../../misc \"$srcdir\"/../../../misc" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_FGREP=$FGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile the Python module" >&5 +$as_echo_n "checking whether to compile the Python module... " >&6; } + # Check whether --enable-python was given. +if test "${enable_python+set}" = set; then : + enableval=$enable_python; egg_enable_python="$enableval" +fi + + # Check whether --enable-python was given. +if test "${enable_python+set}" = set; then : + enableval=$enable_python; egg_enable_python="$enableval" +else + egg_enable_python="autodetect" +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $egg_enable_python" >&5 +$as_echo "$egg_enable_python" >&6; } + + + + +# Check whether --with-python-config was given. +if test "${with_python_config+set}" = set; then : + withval=$with_python_config; + if test "x$enable_python" != "xno"; then + if test -d "$withval" || test -x "$withval"; then + egg_with_python_config="$withval" + else + egg_with_python_config="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Invalid path to python-config. $withval is not a directory and not an executable." >&5 +$as_echo "$as_me: WARNING: Invalid path to python-config. $withval is not a directory and not an executable." >&2;} + fi + fi + +fi + + + + +python_avail="false" + +if test "x$egg_enable_python" != "xno"; then + if test "x$egg_with_python_config" = "x"; then + for ac_prog in python3-config python-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_python_config_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $python_config_bin in + [\\/]* | ?:[\\/]*) + ac_cv_path_python_config_bin="$python_config_bin" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_python_config_bin="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +python_config_bin=$ac_cv_path_python_config_bin +if test -n "$python_config_bin"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_config_bin" >&5 +$as_echo "$python_config_bin" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$python_config_bin" && break +done + + else + if test -d "$egg_with_python_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for python-config binaries in $egg_with_python_config" >&5 +$as_echo "$as_me: Checking for python-config binaries in $egg_with_python_config" >&6;} + for ac_prog in python3-config python-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_python_config_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $python_config_bin in + [\\/]* | ?:[\\/]*) + ac_cv_path_python_config_bin="$python_config_bin" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $egg_with_python_config +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_python_config_bin="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +python_config_bin=$ac_cv_path_python_config_bin +if test -n "$python_config_bin"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_config_bin" >&5 +$as_echo "$python_config_bin" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$python_config_bin" && break +done + + else + if test -x "$egg_with_python_config"; then + python_config_bin="$egg_with_python_config" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Specified --with-python-config=$egg_with_python_config does not exist." >&5 +$as_echo "$as_me: WARNING: Specified --with-python-config=$egg_with_python_config does not exist." >&2;} + fi + fi + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Python module disabled." >&5 +$as_echo "$as_me: Python module disabled." >&6;} +fi + +if test "x$python_config_bin" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether python-config supports --embed" >&5 +$as_echo_n "checking whether python-config supports --embed... " >&6; } + if $python_config_bin --help | $FGREP -q -- --embed; then : + + PYTHON_CONFIG_ARGS="--embed" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + PYTHON_CONFIG_ARGS="" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python C flags" >&5 +$as_echo_n "checking for python C flags... " >&6; } + PYTHON_CFLAGS=`$python_config_bin $PYTHON_CONFIG_ARGS --cflags` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_CFLAGS" >&5 +$as_echo "$PYTHON_CFLAGS" >&6; } + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python LD flags" >&5 +$as_echo_n "checking for python LD flags... " >&6; } + PYTHON_LDFLAGS=`$python_config_bin $PYTHON_CONFIG_ARGS --ldflags` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LDFLAGS" >&5 +$as_echo "$PYTHON_LDFLAGS" >&6; } + + python_avail="true" +fi + +# Disable the module +if test "x$python_avail" = "xfalse"; then + if test "x$egg_enable_python" != "xno"; then + cat >&2 <confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} +t clear +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +t quote +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +t quote +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` + + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by Eggdrop Python Module $as_me 1.9.3, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + +Configuration files: +$config_files + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +Eggdrop Python Module config.status 1.9.3 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2012 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + + +eval set X " :F $CONFIG_FILES " +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + + + + esac + +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi From 93f80617f831aebdcd2d1b0ba5cbbbea85176434 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 7 Aug 2022 17:12:24 +0200 Subject: [PATCH 31/71] Actual binds through C/Tcl API, Tcl calling C calling Python --- scripts/eggdroppy/binds.py | 110 +++++++++++++++++++++++---------- scripts/myscript/myscript.py | 6 +- src/mod/module.h | 4 +- src/mod/python.mod/Makefile.in | 2 +- src/mod/python.mod/pycmds.c | 66 ++++++++++++++++++++ src/mod/python.mod/python.c | 8 +-- src/modules.c | 5 +- src/tclhash.c | 4 +- src/tclhash.h | 5 +- 9 files changed, 161 insertions(+), 49 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index faddece1c..4bce0f214 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -1,8 +1,33 @@ +from dataclasses import dataclass +from typing import Callable import re import uuid import sys from pprint import pprint, pformat -from eggdroppy import FlagRecord +import eggdrop +from eggdroppy.flags import FlagRecord, FlagMatcher +from dataclasses import dataclass + +empty_flags = FlagMatcher() + +@dataclass +class Bind: + flags: FlagMatcher + mask: str + callback: Callable + hits: int = 0 + + @property + def id(self): + return f'bind{hex(id(self))[2:]}' + +class BindCallback: + def __init__(self, callback : Callable): + self.__callback = callback + def __call__(self, *args, **kwargs): + self.__callback(*args, **kwargs) + def __str__(self): + return self.__callback.__name__ class BindType: """ A BindType is an event that can trigger an Eggdrop response @@ -12,27 +37,41 @@ class BindType: Args: bindtype (string): A string representing one of the core Eggdrop bind types + managed (bool): True if bindtype is managed by Eggdrop """ - def __init__(self, bindtype): + def __init__(self, bindtype, managed): self.__bindtype = bindtype + self.__managed = managed self.__binds = {} - def add(self, callback, flags, mask): + @staticmethod + def make_callback_func(callback): + return BindCallback(callback) + + def add(self, mask : str, callback : Callable, flags : FlagMatcher = empty_flags): """ Register a new bind event Adds a new :class:`BindType` attribute to a :class:`Bind` object. Args: - callback (method): The name of the function you wish to call when the event is triggered flags (object): a flag object, we'll figure this out soon mask (str): mask or command or something, maybe find a better word here + callback (method): The name of the function you wish to call when the event is triggered """ - self.__binds.update({uuid.uuid4().hex[:8]:{"callback":callback, "flags":flags, "mask":mask, "hits":0}}) + cb = self.make_callback_func(callback) + if flags is None: + flags = FlagMatcher() + bind = Bind(flags=flags, mask=mask, callback=cb) + self.__binds[bind.id] = bind + if self.__managed: + eggdrop.bind(self.__bindtype, mask, cb) def delete(self, bindid): - print(self.__binds) + bind = self.__binds[bindid] + if self.__managed: + eggdrop.unbind(self.__bindtype, bind.mask, bind.callback) if bindid in self.__binds: - self.__binds.pop(bindid) + del self.__binds[bindid] def list(self): """ List all binds of the ``bindtype`` @@ -46,7 +85,7 @@ def all(self): return self.list() def __str__(self): - return f"Bindtype {self.__bindtype}: {repr(self.__binds)}" + return f"{self.__bindtype}-binds: {str(self.__binds)}" class Binds: """ A :class:`Binds` object holds a collection of :class:`BindTypes` objects @@ -59,8 +98,9 @@ class Binds: """ def __init__(self): self.__binds = {} - self.__binds["pubm"] = BindType("pubm") - self.__binds["join"] = BindType("join") + self.__binds["pubm"] = BindType("pubm", False) + self.__binds["join"] = BindType("join", False) + self.__binds["dcc"] = BindType("dcc", True) def __getattr__(self, name): return self.__binds[name] @@ -81,8 +121,8 @@ def types(self): """ return self.__binds.keys() - def __repr__(self): - return repr(self.__binds) + def __str__(self): + return [{x: [str(b) for b in y]} for x, y in self.__binds.items()] def bindmask2re(mask): r = '' @@ -100,43 +140,43 @@ def bindmask2re(mask): return re.compile('^' + r + '$') def flags_ok(bind, realflags): - return bind["flags"].match(realflags) + return bind.flags.match(realflags) def on_pub(flags, nick, uhost, hand, chan, text): print(f"on_pub({pformat(flags)}, {nick}, {uhost}, {hand}, {chan}, {text.split()[0]}, {text.split(' ', 1)[1]})") for b in __allbinds.pub.list().values(): match_flags = flags_ok(b, flags) - match_mask = (b["cmd"] == text.split()[0]) + match_mask = (b.mask == text.split()[0]) call_bind = True if match_flags and match_mask else False - print(f" checking against {repr(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") + print(f" checking against {str(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") if call_bind: - b["hits"] += 1 - b["callback"](nick, uhost, hand, chan, text.split(" ", 1)[1]) + b.hits += 1 + b.callback(nick, uhost, hand, chan, text.split(" ", 1)[1]) return def on_pubm(flags, nick, uhost, hand, chan, text): print(f"on_pubm({pformat(flags)}, {nick}, {uhost}, {hand}, {chan}, {text})") for b in __allbinds.pubm.list().values(): match_flags = flags_ok(b, flags) - match_mask = bool(bindmask2re(b["mask"]).match(text)) + match_mask = bool(bindmask2re(b.mask).match(text)) call_bind = True if match_flags and match_mask else False - print(f" checking against {repr(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") + print(f" checking against {str(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") if call_bind: - b["hits"] += 1 - b["callback"](nick, uhost, hand, chan, text) + b.hits += 1 + b.callback(nick, uhost, hand, chan, text) on_pub(flags, nick, uhost, hand, chan, text) return -def on_msgm(nick, uhost, hand, text): - print(f"on_pubm({pformat(flags)}, {nick}, {uhost}, {hand}, {text})") +def on_msgm(flags, nick, uhost, hand, text): + print(f"on_msgm({pformat(flags)}, {nick}, {uhost}, {hand}, {text})") for b in __allbinds.msgm.list().values(): match_flags = flags_ok(b, flags) - match_mask = bool(bindmask2re(b["mask"]).match(text)) + match_mask = bool(bindmask2re(b.mask).match(text)) call_bind = True if match_flags and match_mask else False - print(f" checking against {repr(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") + print(f" checking against {str(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") if call_bind: - b["hits"] += 1 - b["callback"](nick, uhost, hand, text) + b.hits += 1 + b.callback(nick, uhost, hand, text) return def on_join(flags, nick, uhost, hand, chan): @@ -150,16 +190,16 @@ def on_join(flags, nick, uhost, hand, chan): print(f"on_join({pformat(flags)}, {nick}, {uhost}, {hand}, {chan})") for b in __allbinds.join.list().values(): match_flags = flags_ok(b, flags) - match_mask = bool(bindmask2re(b["mask"]).match(f"{nick}!{uhost}")) + match_mask = bool(bindmask2re(b.mask).match(f"{nick}!{uhost}")) call_bind = True if match_flags and match_mask else False - print(f" checking against {repr(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") + print(f" checking against {str(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") if call_bind: - b["hits"] += 1 - b["callback"](nick, uhost, hand, chan) + b.hits += 1 + b.callback(nick, uhost, hand, chan) def on_event(bindtype, globalflags, chanflags, botflags, *args): flags = FlagRecord(globalflags, chanflags, botflags) - print(f"on_event({bindtype}, {repr(globalflags)}, {repr(chanflags)}, {repr(botflags)}, {pformat(args)}") + print(f"on_event({bindtype}, {str(globalflags)}, {str(chanflags)}, {str(botflags)}, {pformat(args)}") if bindtype == "pubm": on_pubm(flags, *args) elif bindtype == "msgm": @@ -179,7 +219,7 @@ def all(): def types(): return __allbinds.types() -def print_all(): +def print_all(*args): print("{0: <8} | {1: <18} | {2: <12} | {3: <24} | {4}".format('ID', 'function', 'flags', 'mask', 'hits')) for i in types(): if __allbinds.all()[i].all(): @@ -187,5 +227,7 @@ def print_all(): print(f'{i:<8}') print("-"*78) for j in __allbinds.all()[i].all().keys(): - print(f'{j} | {__allbinds.all()[i].all()[j]["callback"].__name__:<18} | {str(__allbinds.all()[i].all()[j]["flags"]):<12} | {__allbinds.all()[i].all()[j]["mask"]:<24} | {__allbinds.all()[i].all()[j]["hits"]:<4}') + print(f'{j} | {str(__allbinds.all()[i].all()[j].callback):<18} | {str(__allbinds.all()[i].all()[j].flags):<12} | {__allbinds.all()[i].all()[j].mask:<24} | {__allbinds.all()[i].all()[j].hits:<4}') print("-"*78) + +__allbinds.dcc.add(mask='pybinds', callback=print_all) \ No newline at end of file diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py index 25e35358b..8e279076c 100644 --- a/scripts/myscript/myscript.py +++ b/scripts/myscript/myscript.py @@ -33,7 +33,7 @@ def mypub2(nick, user, hand, chan, text): #binds.add("pubm", "!moo*", binds.FlagMatcher(globalflags=binds.UserFlags.o), "*", mypub2) #binds.add("pub", "!title", binds.FlagMatcher(), "*", pubGetTitle) #binds.add("pubm", "what*", binds.FlagMatcher(), "*", pubmGetTitle) -binds.join.add(joinGreetUser, FlagMatcher(), "*") -binds.join.add(joinGreetOp, FlagMatcher(globalflags=perm.op | perm.master | perm.owner, chanflags=perm.o | perm.m | perm.n), "*") -binds.pubm.add(mypub, FlagMatcher(), "*") +binds.join.add(callback=joinGreetUser, flags=FlagMatcher(), mask="*") +binds.join.add(callback=joinGreetOp, flags=FlagMatcher(globalflags=perm.op | perm.master | perm.owner, chanflags=perm.o | perm.m | perm.n), mask="*") +binds.pubm.add(callback=mypub, flags=FlagMatcher(), mask="*") pprint(binds.all()) diff --git a/src/mod/module.h b/src/mod/module.h index eb9f761d9..d66d7ce5d 100644 --- a/src/mod/module.h +++ b/src/mod/module.h @@ -522,7 +522,9 @@ #define USERENTRY_ACCOUNT (*(struct user_entry_type *)(global[316])) #define get_user_by_account ((struct userrec * (*)(char *))global[317]) #define delaccount_by_handle ((int(*)(char *,char *))global[318]) - +#define bind_bind_entry ((int(*)(tcl_bind_list_t *, const char *, const char *, const char *))global[319]) +/* 320 - 323 */ +#define unbind_bind_entry ((int(*)(tcl_bind_list_t *, const char *, const char *, const char *))global[320]) /* hostmasking */ diff --git a/src/mod/python.mod/Makefile.in b/src/mod/python.mod/Makefile.in index 297fbafbe..2b5285057 100644 --- a/src/mod/python.mod/Makefile.in +++ b/src/mod/python.mod/Makefile.in @@ -2,7 +2,7 @@ srcdir = . PYTHON_CFLAGS = @PYTHON_CFLAGS@ -PYTHON_LDFLAGS = @PYTHON_CFLAGS@ +PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ doofus: @echo "" && \ diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 4044d0544..90a3aadc1 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -1,6 +1,16 @@ #define PY_SSIZE_T_CLEAN #include +#include +#include "src/mod/module.h" + +struct py_bind { + tcl_bind_list_t *bindtable; + char tclcmdname[512]; + PyObject *callback; + struct py_bind *next; +}; +static struct py_bind *py_bindlist; static PyObject *EggdropError; //create static Python Exception object @@ -29,10 +39,66 @@ static PyObject *py_ircsend(PyObject *self, PyObject *args) { Py_RETURN_NONE; } +static int tcl_call_python(ClientData cd, Tcl_Interp *irp, int objc, Tcl_Obj *const objv[]) +{ + PyObject *args = PyTuple_New(objc); + struct py_bind *bindinfo = cd; + + for (int i = 0; i < objc; i++) { + PyTuple_SET_ITEM(args, i, Py_BuildValue("s", Tcl_GetStringFromObj(objv[i], NULL))); + } + if (!PyObject_Call(bindinfo->callback, args, NULL)) { + PyErr_Print(); + Tcl_SetResult(irp, "Error calling python code", NULL); + return TCL_ERROR; + } + return TCL_OK; +} + + +static PyObject *py_bind(PyObject *self, PyObject *args) { + PyObject *callback; + char *bindtype, *mask; + struct py_bind *bindinfo; + tcl_bind_list_t *tl; + + // type flags mask callback + if (!PyArg_ParseTuple(args, "ssO", &bindtype, &mask, &callback) || !callback) { + PyErr_SetString(EggdropError, "wrong arguments"); + return NULL; + } + if (!(tl = find_bind_table(bindtype))) { + PyErr_SetString(EggdropError, "unknown bind type"); + return NULL; + } + if (callback == Py_None) { + PyErr_SetString(EggdropError, "callback is None"); + return NULL; + } + if (!PyCallable_Check(callback)) { + PyErr_SetString(EggdropError, "callback is not callable"); + return NULL; + } + Py_IncRef(callback); + + bindinfo = nmalloc(sizeof *bindinfo); + bindinfo->bindtable = tl; + bindinfo->callback = callback; + bindinfo->next = py_bindlist; + snprintf(bindinfo->tclcmdname, sizeof bindinfo->tclcmdname, "*python:%s:%s:%" PRIxPTR, bindtype, mask, (uintptr_t)callback); + py_bindlist = bindinfo; + // TODO: deleteproc + Tcl_CreateObjCommand(tclinterp, bindinfo->tclcmdname, tcl_call_python, bindinfo, NULL); + // TODO: flags? + bind_bind_entry(tl, "-", mask, bindinfo->tclcmdname); + Py_RETURN_NONE; +} + static PyMethodDef MyPyMethods[] = { {"testcmd", testcmd, METH_VARARGS, "A test dict"}, {"ircsend", py_ircsend, METH_VARARGS, "Send message to server"}, + {"bind", py_bind, METH_VARARGS, "regsiter an eggdrop python bind"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index ec5de08b8..29c8ab242 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -29,7 +29,9 @@ #define ARRAYCOUNT(x) (sizeof (x) / sizeof *(x)) #include "src/mod/module.h" +// HACK, but stable API #undef interp +#define tclinterp (*(Tcl_Interp **)(global[128])) #include #include #include "src/mod/irc.mod/irc.h" @@ -278,11 +280,6 @@ static void cmd_pysource(struct userrec *u, int idx, char *par) { return; } -static void cmd_pybinds(struct userrec *u, int idx, char *par) { - cmd_pyexpr(u, idx, "eggdroppy.binds.print_all()"); - return; -} - /* A report on the module status. * * details is either 0 or 1: @@ -304,7 +301,6 @@ static cmd_t mydcc[] = { {"pysource", "", (IntFunc) cmd_pysource, NULL}, {"python", "", (IntFunc) cmd_python, NULL}, {"pyexpr", "", (IntFunc) cmd_pyexpr, NULL}, - {"pybinds", "", (IntFunc) cmd_pybinds, NULL}, {NULL, NULL, NULL, NULL} /* Mark end. */ }; diff --git a/src/modules.c b/src/modules.c index 6c42ff14d..06866b4e6 100644 --- a/src/modules.c +++ b/src/modules.c @@ -627,7 +627,10 @@ Function global_table[] = { /* 316 - 319 */ (Function) & USERENTRY_ACCOUNT, /* struct user_entry_type * */ (Function) get_user_by_account, - (Function) delhost_by_handle + (Function) delhost_by_handle, + (Function) bind_bind_entry, +/* 320 - 323 */ + (Function) unbind_bind_entry }; void init_modules(void) diff --git a/src/tclhash.c b/src/tclhash.c index 33b0c39b7..41f959fae 100644 --- a/src/tclhash.c +++ b/src/tclhash.c @@ -348,7 +348,7 @@ static void dump_bind_tables(Tcl_Interp *irp) } } -static int unbind_bind_entry(tcl_bind_list_t *tl, const char *flags, +int unbind_bind_entry(tcl_bind_list_t *tl, const char *flags, const char *cmd, const char *proc) { tcl_bind_mask_t *tm; @@ -380,7 +380,7 @@ static int unbind_bind_entry(tcl_bind_list_t *tl, const char *flags, /* Add command (remove old one if necessary) */ -static int bind_bind_entry(tcl_bind_list_t *tl, const char *flags, +int bind_bind_entry(tcl_bind_list_t *tl, const char *flags, const char *cmd, const char *proc) { tcl_cmd_t *tc; diff --git a/src/tclhash.h b/src/tclhash.h index 47e877098..53997a402 100644 --- a/src/tclhash.h +++ b/src/tclhash.h @@ -79,7 +79,10 @@ tcl_bind_list_t *add_bind_table(const char *nme, int flg, IntFunc func); void del_bind_table(tcl_bind_list_t *tl_which); tcl_bind_list_t *find_bind_table(const char *nme); - +int bind_bind_entry(tcl_bind_list_t *tl, const char *flags, + const char *cmd, const char *proc); +int unbind_bind_entry(tcl_bind_list_t *tl, const char *flags, + const char *cmd, const char *proc); int check_tcl_bind(tcl_bind_list_t *, const char *, struct flag_record *, const char *, int); int check_tcl_dcc(const char *, int, const char *); From 6b92bd147c2d0d84f695c87cf7fd7fd1c6bcd39b Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Mon, 8 Aug 2022 19:28:53 +0200 Subject: [PATCH 32/71] Use eggdrop internal binds and kwargs calling only --- scripts/eggdroppy/binds.py | 170 +++++++++++++---------------------- scripts/myscript/myscript.py | 29 +++--- src/mod/python.mod/pycmds.c | 13 +-- src/mod/python.mod/python.c | 41 --------- 4 files changed, 86 insertions(+), 167 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index 4bce0f214..265c5989e 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -6,12 +6,14 @@ from pprint import pprint, pformat import eggdrop from eggdroppy.flags import FlagRecord, FlagMatcher +from eggdroppy.cmds import putmsg, putnotc from dataclasses import dataclass empty_flags = FlagMatcher() @dataclass class Bind: + bindtype: str flags: FlagMatcher mask: str callback: Callable @@ -19,13 +21,52 @@ class Bind: @property def id(self): - return f'bind{hex(id(self))[2:]}' + return f'{self.bindtype}{hex(id(self))[2:]}' class BindCallback: - def __init__(self, callback : Callable): + bindargs = { + "pub": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, + "pubm": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, + "msg": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, + "msgm": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, + "dcc": {"args": ("handle", "idx", "text"), "reply": "dcc"}, + "join": {"args": ("nick", "host", "handle", "channel"), "reply": "privnotc"} + } + + @staticmethod + def make_replyfunc(replytype, argdict): + replyfunc = None + if replytype == "chanmsg": + def replyfunc(response): + putmsg(argdict["channel"], response) + elif replytype == "privmsg": + def replyfunc(response): + putmsg(argdict["nick"], response) + elif replytype == "privnotc": + def replyfunc(response): + putnotc(argdict["nick"], response) + elif replytype == "dcc": + def replyfunc(response): + # TODO: putdcc + print(f"Python DCC response: {response}") + return replyfunc + + def __init__(self, bindtype, mask, callback : Callable): self.__callback = callback - def __call__(self, *args, **kwargs): - self.__callback(*args, **kwargs) + self.__bindtype = bindtype + self.__mask = mask + + def __call__(self, *args): + bindinfo = self.bindargs[self.__bindtype] + pprint(args) + + kwargs = {"bindtype": self.__bindtype, "mask": self.__mask} + kwargs.update(zip(bindinfo["args"], args)) + if "reply" in bindinfo: + kwargs["reply"] = self.make_replyfunc(bindinfo["reply"], argdict=kwargs) + pprint(kwargs) + self.__callback(**kwargs) + def __str__(self): return self.__callback.__name__ @@ -45,10 +86,10 @@ def __init__(self, bindtype, managed): self.__binds = {} @staticmethod - def make_callback_func(callback): - return BindCallback(callback) + def make_callback_func(bindtype, mask, callback): + return BindCallback(bindtype, mask, callback) - def add(self, mask : str, callback : Callable, flags : FlagMatcher = empty_flags): + def add(self, mask : str, callback : Callable, flags : str = "-"): """ Register a new bind event Adds a new :class:`BindType` attribute to a :class:`Bind` object. @@ -58,18 +99,16 @@ def add(self, mask : str, callback : Callable, flags : FlagMatcher = empty_flags mask (str): mask or command or something, maybe find a better word here callback (method): The name of the function you wish to call when the event is triggered """ - cb = self.make_callback_func(callback) - if flags is None: - flags = FlagMatcher() - bind = Bind(flags=flags, mask=mask, callback=cb) + cb = self.make_callback_func(bindtype=self.__bindtype, mask=mask, callback=callback) + bind = Bind(flags=flags, mask=mask, callback=cb, bindtype=self.__bindtype) self.__binds[bind.id] = bind if self.__managed: - eggdrop.bind(self.__bindtype, mask, cb) + eggdrop.bind(self.__bindtype, flags, mask, cb) def delete(self, bindid): bind = self.__binds[bindid] if self.__managed: - eggdrop.unbind(self.__bindtype, bind.mask, bind.callback) + eggdrop.unbind(self.__bindtype, bind.flags, bind.mask, bind.callback) if bindid in self.__binds: del self.__binds[bindid] @@ -98,8 +137,11 @@ class Binds: """ def __init__(self): self.__binds = {} - self.__binds["pubm"] = BindType("pubm", False) - self.__binds["join"] = BindType("join", False) + self.__binds["pubm"] = BindType("pubm", True) + self.__binds["pub"] = BindType("pub", True) + self.__binds["msgm"] = BindType("msgm", True) + self.__binds["msg"] = BindType("msg", True) + self.__binds["join"] = BindType("join", True) self.__binds["dcc"] = BindType("dcc", True) def __getattr__(self, name): @@ -124,90 +166,6 @@ def types(self): def __str__(self): return [{x: [str(b) for b in y]} for x, y in self.__binds.items()] -def bindmask2re(mask): - r = '' - for c in mask: - if c == '?': - r += '.' - elif c == '*': - r += '.*' - elif c == '%': - r += '\S*' - elif c == '~': - r += '\s+' - else: - r += re.escape(c) - return re.compile('^' + r + '$') - -def flags_ok(bind, realflags): - return bind.flags.match(realflags) - -def on_pub(flags, nick, uhost, hand, chan, text): - print(f"on_pub({pformat(flags)}, {nick}, {uhost}, {hand}, {chan}, {text.split()[0]}, {text.split(' ', 1)[1]})") - for b in __allbinds.pub.list().values(): - match_flags = flags_ok(b, flags) - match_mask = (b.mask == text.split()[0]) - call_bind = True if match_flags and match_mask else False - print(f" checking against {str(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") - if call_bind: - b.hits += 1 - b.callback(nick, uhost, hand, chan, text.split(" ", 1)[1]) - return - -def on_pubm(flags, nick, uhost, hand, chan, text): - print(f"on_pubm({pformat(flags)}, {nick}, {uhost}, {hand}, {chan}, {text})") - for b in __allbinds.pubm.list().values(): - match_flags = flags_ok(b, flags) - match_mask = bool(bindmask2re(b.mask).match(text)) - call_bind = True if match_flags and match_mask else False - print(f" checking against {str(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") - if call_bind: - b.hits += 1 - b.callback(nick, uhost, hand, chan, text) - on_pub(flags, nick, uhost, hand, chan, text) - return - -def on_msgm(flags, nick, uhost, hand, text): - print(f"on_msgm({pformat(flags)}, {nick}, {uhost}, {hand}, {text})") - for b in __allbinds.msgm.list().values(): - match_flags = flags_ok(b, flags) - match_mask = bool(bindmask2re(b.mask).match(text)) - call_bind = True if match_flags and match_mask else False - print(f" checking against {str(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") - if call_bind: - b.hits += 1 - b.callback(nick, uhost, hand, text) - return - -def on_join(flags, nick, uhost, hand, chan): - """This method searches for binds to be triggered when a user joins a channel. - - :param mask: a user hostmask, wildcards supported - :param flags: flags for the user - - :returns: nick hostmask handle channel - """ - print(f"on_join({pformat(flags)}, {nick}, {uhost}, {hand}, {chan})") - for b in __allbinds.join.list().values(): - match_flags = flags_ok(b, flags) - match_mask = bool(bindmask2re(b.mask).match(f"{nick}!{uhost}")) - call_bind = True if match_flags and match_mask else False - print(f" checking against {str(b)}: Flags={match_flags} Mask={match_mask}: {'Trigger' if call_bind else 'Skip'}") - if call_bind: - b.hits += 1 - b.callback(nick, uhost, hand, chan) - -def on_event(bindtype, globalflags, chanflags, botflags, *args): - flags = FlagRecord(globalflags, chanflags, botflags) - print(f"on_event({bindtype}, {str(globalflags)}, {str(chanflags)}, {str(botflags)}, {pformat(args)}") - if bindtype == "pubm": - on_pubm(flags, *args) - elif bindtype == "msgm": - on_msgm(flags, *args) - elif bindtype == "join": - on_join(flags, *args) - return 0 - __allbinds = Binds() for bindtype in __allbinds.types(): @@ -219,15 +177,15 @@ def all(): def types(): return __allbinds.types() -def print_all(*args): - print("{0: <8} | {1: <18} | {2: <12} | {3: <24} | {4}".format('ID', 'function', 'flags', 'mask', 'hits')) +def print_all(reply, **kwargs): + reply("{0: <8} | {1: <18} | {2: <12} | {3: <24} | {4}".format('ID', 'function', 'flags', 'mask', 'hits')) for i in types(): if __allbinds.all()[i].all(): - print("-"*78) - print(f'{i:<8}') - print("-"*78) + reply("-"*78) + reply(f'{i:<8}') + reply("-"*78) for j in __allbinds.all()[i].all().keys(): - print(f'{j} | {str(__allbinds.all()[i].all()[j].callback):<18} | {str(__allbinds.all()[i].all()[j].flags):<12} | {__allbinds.all()[i].all()[j].mask:<24} | {__allbinds.all()[i].all()[j].hits:<4}') - print("-"*78) + reply(f'{j} | {str(__allbinds.all()[i].all()[j].callback):<18} | {str(__allbinds.all()[i].all()[j].flags):<12} | {__allbinds.all()[i].all()[j].mask:<24} | {__allbinds.all()[i].all()[j].hits:<4}') + reply("-"*78) __allbinds.dcc.add(mask='pybinds', callback=print_all) \ No newline at end of file diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py index 8e279076c..b15cbd0bb 100644 --- a/scripts/myscript/myscript.py +++ b/scripts/myscript/myscript.py @@ -3,37 +3,38 @@ from eggdroppy import binds, FlagMatcher, UserFlags as perm, putmsg from pprint import pprint -def pubGetTitle(nick, uhost, hand, chan, text): +def pubGetTitle(nick, host, handle, channel, text, **kwargs): print(text) reqs = requests.get(text) soup = BeautifulSoup(reqs.text, 'html.parser') putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) -def pubmGetTitle(nick, uhost, hand, chan, text): +def pubmGetTitle(nick, host, handle, channel, text, **kwargs): print(text) reqs = requests.get(text.split()[1]) soup = BeautifulSoup(reqs.text, 'html.parser') putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) -def joinGreetUser(nick, uhost, hand, chan): - print("JOIN BIND TRIGGERED SUCCESSFULLY") - putmsg(chan, f"Hello {nick}, welcome to {chan}") +def joinGreetUser(nick, host, handle, channel, **kwargs): + putmsg(channel, f"Hello {nick}, welcome to {channel}") -def mypub(nick, user, hand, chan, text): - putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) +# Called from pub or msg, responds public or privately +def mypub(nick, reply, **kwargs): + reply(f"{nick}, you said !moo") + #putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) return -def joinGreetOp(nick, uhost, hand, chan): - putmsg(chan, f"Hello {nick}, welcome to {chan}, you are an operator") +def joinGreetOp(nick, channel, reply, **kwargs): + reply(f"Hello {nick}, welcome to {channel}, you are an operator") -def mypub2(nick, user, hand, chan, text): +def mypub2(nick, user, hand, chan, text, **kwargs): print("!!! "+nick+"+ on "+chan+" said "+text+" and is a global +o") -#binds.add("pubm", "!moo", binds.FlagMatcher(), "*", mypub) +binds.pub.add(callback=mypub, mask="!moo") +binds.msg.add(callback=mypub, mask="!moo") #binds.add("pubm", "!moo*", binds.FlagMatcher(globalflags=binds.UserFlags.o), "*", mypub2) #binds.add("pub", "!title", binds.FlagMatcher(), "*", pubGetTitle) #binds.add("pubm", "what*", binds.FlagMatcher(), "*", pubmGetTitle) -binds.join.add(callback=joinGreetUser, flags=FlagMatcher(), mask="*") -binds.join.add(callback=joinGreetOp, flags=FlagMatcher(globalflags=perm.op | perm.master | perm.owner, chanflags=perm.o | perm.m | perm.n), mask="*") -binds.pubm.add(callback=mypub, flags=FlagMatcher(), mask="*") +binds.join.add(callback=joinGreetUser, mask="*") +binds.join.add(callback=joinGreetOp, flags="+mno|+mno", mask="*") pprint(binds.all()) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 90a3aadc1..8312db1b0 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -41,11 +41,12 @@ static PyObject *py_ircsend(PyObject *self, PyObject *args) { static int tcl_call_python(ClientData cd, Tcl_Interp *irp, int objc, Tcl_Obj *const objv[]) { - PyObject *args = PyTuple_New(objc); + PyObject *args = PyTuple_New(objc > 1 ? objc - 1: 0); struct py_bind *bindinfo = cd; - for (int i = 0; i < objc; i++) { - PyTuple_SET_ITEM(args, i, Py_BuildValue("s", Tcl_GetStringFromObj(objv[i], NULL))); + // objc[0] is procname + for (int i = 1; i < objc; i++) { + PyTuple_SET_ITEM(args, i - 1, Py_BuildValue("s", Tcl_GetStringFromObj(objv[i], NULL))); } if (!PyObject_Call(bindinfo->callback, args, NULL)) { PyErr_Print(); @@ -58,12 +59,12 @@ static int tcl_call_python(ClientData cd, Tcl_Interp *irp, int objc, Tcl_Obj *co static PyObject *py_bind(PyObject *self, PyObject *args) { PyObject *callback; - char *bindtype, *mask; + char *bindtype, *mask, *flags; struct py_bind *bindinfo; tcl_bind_list_t *tl; // type flags mask callback - if (!PyArg_ParseTuple(args, "ssO", &bindtype, &mask, &callback) || !callback) { + if (!PyArg_ParseTuple(args, "sssO", &bindtype, &flags, &mask, &callback) || !callback) { PyErr_SetString(EggdropError, "wrong arguments"); return NULL; } @@ -90,7 +91,7 @@ static PyObject *py_bind(PyObject *self, PyObject *args) { // TODO: deleteproc Tcl_CreateObjCommand(tclinterp, bindinfo->tclcmdname, tcl_call_python, bindinfo, NULL); // TODO: flags? - bind_bind_entry(tl, "-", mask, bindinfo->tclcmdname); + bind_bind_entry(tl, flags, mask, bindinfo->tclcmdname); Py_RETURN_NONE; } diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 29c8ab242..db89721ed 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -304,47 +304,11 @@ static cmd_t mydcc[] = { {NULL, NULL, NULL, NULL} /* Mark end. */ }; -static cmd_t mypy_pubm[] = { - {"*", "", py_pubm, "python:pubm"}, - {NULL, NULL, NULL, NULL} -}; - -static cmd_t mypy_join[] = { - {"*", "", py_join, "python:join"}, - {NULL, NULL, NULL, NULL} -}; - -/*static tcl_cmds mytcl[] = { - {"twcmd", tcl_twcmd}, - {"roomstate", tcl_roomstate}, - {"userstate", tcl_userstate}, - {"twitchmods", tcl_twitchmods}, - {"twitchvips", tcl_twitchvips}, - {"ismod", tcl_ismod}, - {"isvip", tcl_isvip}, - {NULL, NULL} -}; */ - -/* -static tcl_ints my_tcl_ints[] = { - {"keep-nick", &keepnick, STR_PROTECT}, - {NULL, NULL, 0} -}; */ - -/* -static tcl_strings my_tcl_strings[] = { - {"cap-request", cap_request, 55, STR_PROTECT}, - {NULL, NULL, 0, 0} -}; */ - static char *python_close() { Context; kill_python(); rem_builtins(H_dcc, mydcc); - rem_builtins(H_pubm, mypy_pubm); -// rem_tcl_commands(mytcl); -// rem_tcl_ints(my_tcl_ints); module_undepend(MODULE_NAME); return NULL; } @@ -387,11 +351,6 @@ char *python_start(Function *global_funcs) init_python(); /* Add command table to bind list */ - add_builtins(H_pubm, mypy_pubm); - add_builtins(H_join, mypy_join); add_builtins(H_dcc, mydcc); -// add_tcl_commands(mytcl); -// add_tcl_ints(my_tcl_ints); -// add_tcl_strings(my_tcl_strings); return NULL; } From 4a4bdc15496c2f114e8a38803f6b67b1d3b6609e Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Mon, 8 Aug 2022 19:38:37 +0200 Subject: [PATCH 33/71] Only one place defines bind types now --- scripts/eggdroppy/binds.py | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index 265c5989e..04e154fcf 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -9,7 +9,14 @@ from eggdroppy.cmds import putmsg, putnotc from dataclasses import dataclass -empty_flags = FlagMatcher() +bindtypes = { + "pub": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, + "pubm": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, + "msg": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, + "msgm": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, + "dcc": {"args": ("handle", "idx", "text"), "reply": "dcc"}, + "join": {"args": ("nick", "host", "handle", "channel"), "reply": "privnotc"} +} @dataclass class Bind: @@ -24,14 +31,6 @@ def id(self): return f'{self.bindtype}{hex(id(self))[2:]}' class BindCallback: - bindargs = { - "pub": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, - "pubm": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, - "msg": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, - "msgm": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, - "dcc": {"args": ("handle", "idx", "text"), "reply": "dcc"}, - "join": {"args": ("nick", "host", "handle", "channel"), "reply": "privnotc"} - } @staticmethod def make_replyfunc(replytype, argdict): @@ -57,7 +56,7 @@ def __init__(self, bindtype, mask, callback : Callable): self.__mask = mask def __call__(self, *args): - bindinfo = self.bindargs[self.__bindtype] + bindinfo = bindtypes[self.__bindtype] pprint(args) kwargs = {"bindtype": self.__bindtype, "mask": self.__mask} @@ -136,13 +135,7 @@ class Binds: Args: None """ def __init__(self): - self.__binds = {} - self.__binds["pubm"] = BindType("pubm", True) - self.__binds["pub"] = BindType("pub", True) - self.__binds["msgm"] = BindType("msgm", True) - self.__binds["msg"] = BindType("msg", True) - self.__binds["join"] = BindType("join", True) - self.__binds["dcc"] = BindType("dcc", True) + self.__binds = {x: BindType(x, True) for x in bindtypes.keys()} def __getattr__(self, name): return self.__binds[name] @@ -166,6 +159,7 @@ def types(self): def __str__(self): return [{x: [str(b) for b in y]} for x, y in self.__binds.items()] + __allbinds = Binds() for bindtype in __allbinds.types(): From 69aed30075672ece792901e3195c5b890f379dec Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Mon, 8 Aug 2022 20:21:28 +0200 Subject: [PATCH 34/71] fix flags type in bind list --- scripts/eggdroppy/binds.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index 04e154fcf..5cb84f16f 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -21,7 +21,7 @@ @dataclass class Bind: bindtype: str - flags: FlagMatcher + flags: str mask: str callback: Callable hits: int = 0 @@ -56,13 +56,14 @@ def __init__(self, bindtype, mask, callback : Callable): self.__mask = mask def __call__(self, *args): - bindinfo = bindtypes[self.__bindtype] pprint(args) + bindinfo = bindtypes[self.__bindtype] kwargs = {"bindtype": self.__bindtype, "mask": self.__mask} kwargs.update(zip(bindinfo["args"], args)) if "reply" in bindinfo: kwargs["reply"] = self.make_replyfunc(bindinfo["reply"], argdict=kwargs) + pprint(kwargs) self.__callback(**kwargs) From 3d3c0cf3bd931df32098c8a26f5db0399ed65ec4 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Mon, 8 Aug 2022 21:48:59 +0200 Subject: [PATCH 35/71] Add ircuser dataclass to bind callbacks if applicable --- scripts/eggdroppy/binds.py | 12 +++++++++++ scripts/myscript/myscript.py | 6 +++--- src/mod/python.mod/pycmds.c | 40 ++++++++++++++++++++++++++++++++++-- src/mod/python.mod/python.c | 3 +++ 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index 5cb84f16f..fc88bfede 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -8,6 +8,7 @@ from eggdroppy.flags import FlagRecord, FlagMatcher from eggdroppy.cmds import putmsg, putnotc from dataclasses import dataclass +from datetime import datetime bindtypes = { "pub": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, @@ -18,6 +19,14 @@ "join": {"args": ("nick", "host", "handle", "channel"), "reply": "privnotc"} } +@dataclass +class IRCUser: + nick: str + host: str + account: str + lastseen: datetime = None + joined: datetime = None + @dataclass class Bind: bindtype: str @@ -61,6 +70,9 @@ def __call__(self, *args): kwargs = {"bindtype": self.__bindtype, "mask": self.__mask} kwargs.update(zip(bindinfo["args"], args)) + if "nick" in kwargs: + ircuser_dict = eggdrop.findircuser(kwargs["nick"], kwargs["channel"]) if "channel" in kwargs else eggdrop.findircuser(kwargs["nick"]) + kwargs["ircuser"] = IRCUser(**ircuser_dict) if "reply" in bindinfo: kwargs["reply"] = self.make_replyfunc(bindinfo["reply"], argdict=kwargs) diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py index b15cbd0bb..42ac27ab3 100644 --- a/scripts/myscript/myscript.py +++ b/scripts/myscript/myscript.py @@ -13,14 +13,14 @@ def pubmGetTitle(nick, host, handle, channel, text, **kwargs): print(text) reqs = requests.get(text.split()[1]) soup = BeautifulSoup(reqs.text, 'html.parser') - putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) + putmsg(channel, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) def joinGreetUser(nick, host, handle, channel, **kwargs): putmsg(channel, f"Hello {nick}, welcome to {channel}") # Called from pub or msg, responds public or privately -def mypub(nick, reply, **kwargs): - reply(f"{nick}, you said !moo") +def mypub(reply, ircuser, **kwargs): + reply(f"{ircuser.nick}, you said !moo, your current account is {ircuser.account}") #putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) return diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 8312db1b0..7064ae2d2 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -1,5 +1,6 @@ #define PY_SSIZE_T_CLEAN #include +#include #include #include "src/mod/module.h" @@ -30,7 +31,7 @@ static PyObject *py_ircsend(PyObject *self, PyObject *args) { char *text; int queuenum; - if(!PyArg_ParseTuple(args, "si", &text, &queuenum)) { + if (!PyArg_ParseTuple(args, "si", &text, &queuenum)) { PyErr_SetString(EggdropError, "wrong number of args"); return NULL; } @@ -39,6 +40,40 @@ static PyObject *py_ircsend(PyObject *self, PyObject *args) { Py_RETURN_NONE; } +static PyObject *make_ircuser_dict(memberlist *m) { + PyObject *result = PyDict_New(); + PyDict_SetItemString(result, "nick", PyUnicode_FromString(m->nick)); + PyDict_SetItemString(result, "host", PyUnicode_FromString(m->userhost)); + if (m->joined) { + PyObject *tmp = PyTuple_New(1); + PyTuple_SET_ITEM(tmp, 0, PyFloat_FromDouble((double)m->joined)); + PyDict_SetItemString(result, "joined", PyDateTime_FromTimestamp(tmp)); + } + if (m->last) { + PyObject *tmp = PyTuple_New(1); + PyTuple_SET_ITEM(tmp, 0, PyFloat_FromDouble((double)m->last)); + PyDict_SetItemString(result, "lastseen", PyDateTime_FromTimestamp(tmp)); + } + PyDict_SetItemString(result, "account", m->account[0] ? PyUnicode_FromString(m->account) : Py_None); + return result; +} + +static PyObject *py_findircuser(PyObject *self, PyObject *args) { + char *nick, *chan = NULL; + + if (!PyArg_ParseTuple(args, "s|s", &nick, &chan)) { + PyErr_SetString(EggdropError, "wrong number of args"); + return NULL; + } + for (struct chanset_t *ch = chan ? findchan_by_dname(chan) : chanset; ch; ch = chan ? NULL : ch->next) { + memberlist *m = ismember(ch, nick); + if (m) { + return make_ircuser_dict(m); + } + } + Py_RETURN_NONE; +} + static int tcl_call_python(ClientData cd, Tcl_Interp *irp, int objc, Tcl_Obj *const objv[]) { PyObject *args = PyTuple_New(objc > 1 ? objc - 1: 0); @@ -99,7 +134,8 @@ static PyObject *py_bind(PyObject *self, PyObject *args) { static PyMethodDef MyPyMethods[] = { {"testcmd", testcmd, METH_VARARGS, "A test dict"}, {"ircsend", py_ircsend, METH_VARARGS, "Send message to server"}, - {"bind", py_bind, METH_VARARGS, "regsiter an eggdrop python bind"}, + {"bind", py_bind, METH_VARARGS, "register an eggdrop python bind"}, + {"findircuser", py_findircuser, METH_VARARGS, "find an IRC user by nickname and optional channel"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index db89721ed..c1ca63b63 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -32,8 +32,10 @@ // HACK, but stable API #undef interp #define tclinterp (*(Tcl_Interp **)(global[128])) +#undef days #include #include +#include #include "src/mod/irc.mod/irc.h" #include "src/mod/server.mod/server.h" #include "src/mod/python.mod/python.h" @@ -127,6 +129,7 @@ static void init_python() { exit(1); } Py_Initialize(); + PyDateTime_IMPORT; pmodule = PyImport_ImportModule("eggdrop"); if (!pmodule) { PyErr_Print(); From 189287cc0539f73b8f048d2e694cea4a490508b8 Mon Sep 17 00:00:00 2001 From: Geo Date: Mon, 8 Aug 2022 21:42:52 -0400 Subject: [PATCH 36/71] add all bind types --- scripts/eggdroppy/binds.py | 52 +++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py index fc88bfede..8c7238903 100644 --- a/scripts/eggdroppy/binds.py +++ b/scripts/eggdroppy/binds.py @@ -17,6 +17,56 @@ "msgm": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, "dcc": {"args": ("handle", "idx", "text"), "reply": "dcc"}, "join": {"args": ("nick", "host", "handle", "channel"), "reply": "privnotc"} +""" + "fil": {"args": ("handle", "idx", "text"), "reply": "xxx"}, + "notc": {"args": ("nick", "host", "handle", "text", "dest"), "reply": "xxx"}, + "part": {"args": ("nick", "host", "handle", "channel", "msg"), "reply": "xxx"}, + "sign": {"args": ("nick", "host", "handle", "channel", "reason"), "reply": "xxx"}, + "kick": {"args": ("nick", "host", "handle", "channel", "topic"), "reply": "xxx"}, + "nick": {"args": ("nick", "host", "handle", "channel", "newnick"), "reply": "xxx"}, + "mode": {"args": ("nick", "host", "handle", "channel", "mode", "target"), "reply": "xxx"}, + "ctcp": {"args": ("nick", "host", "handle", "dest", "key", "text"), "reply": "xxx"}, + "ctcr": {"args": ("nick", "host", "handle", "dest", "key", "text"), "reply": "xxx"}, + "raw": {"args": ("from", "key", "text"), "reply": "xxx"}, + "bot": {"args": ("bot", "cmd", "text"), "reply": "xxx"}, + "chon": {"args": ("handle", "idx"), "reply": "xxx"}, + "chof": {"args": ("handle", "idx"), "reply": "xxx"}, + "sent": {"args": ("nick", "handle", "file"), "reply": "xxx"}, + "rcvd": {"args": ("nick", "handle", "file"), "reply": "xxx"}, + "chat": {"args": ("handle", "channel", "text"), "reply": "xxx"}, + "link": {"args": ("bot", "via"), "reply": "xxx"}, + "disc": {"args": ("bot"), "reply": "xxx"}, + "splt": {"args": ("nick", "host", "handle", "channel"), "reply": "xxx"}, + "rejn": {"args": ("nick", "host", "handle", "channel"), "reply": "xxx"}, + "filt": {"args": ("idx", "text"), "reply": "xxx"}, + "need": {"args": ("channel", "type"), "reply": "xxx"}, + "flud": {"args": ("nick", "host", "handle", "channel", "type"), "reply": "xxx"}, + "note": {"args": ("from", "to", "text"), "reply": "xxx"}, + "act": {"args": ("handle", "channel", "action"), "reply": "xxx"}, + "wall": {"args": ("from", "msg"), "reply": "xxx"}, + "bcst": {"args": ("bot", "channel", "text"), "reply": "xxx"}, + "chjn": {"args": ("bot", "host", "handle", "channel", "flag", "idx"), "reply": "xxx"}, + "chpt": {"args": ("bot", "handle", "channel", "idx"), "reply": "xxx"}, + "time": {"args": ("min", "hour", "day", "month", "year"), "reply": "xxx"}, + "away": {"args": ("bot", "idx", "text"), "reply": "xxx"}, + "load": {"args": ("module"), "reply": "xxx"}, + "unld": {"args": ("module"), "reply": "xxx"}, + "nkch": {"args": ("old", "new"), "reply": "xxx"}, + "evnt": {"args": ("type"), "reply": "xxx"}, + "lost": {"args": ("nick", "handle", "path", "bytes", "length"), "reply": "xxx"}, + "tout": {"args": ("nick", "handle", "path", "bytes", "length"), "reply": "xxx"}, + "out": {"args": ("queue", "text", "sent"), "reply": "xxx"}, + "cron": {"args": ("min", "hour", "day", "month", "weekday"), "reply": "xxx"}, + "log": {"args": ("channel", "text", "level"), "reply": "xxx"}, + "tls": {"args": ("idx"), "reply": "xxx"}, + "die": {"args": ("reason"), "reply": "xxx"}, + "ircaway": {"args": ("nick", "host", "handle", "channel", "msg"), "reply": "xxx"}, + "invt": {"args": ("nick", "host", "handle", "channel", "invitee"), "reply": "xxx"}, + "rawt": {"args": ("from", "key", "text", "tag"), "reply": "xxx"}, + "account": {"args": ("nick", "host", "handle", "channel", "account"), "reply": "xxx"}, + "isupport": {"args": ("key", "isset", "value"), "reply": "xxx"}, + "monitor": {"args": ("nick", "online"), "reply": "xxx"} +""" } @dataclass @@ -195,4 +245,4 @@ def print_all(reply, **kwargs): reply(f'{j} | {str(__allbinds.all()[i].all()[j].callback):<18} | {str(__allbinds.all()[i].all()[j].flags):<12} | {__allbinds.all()[i].all()[j].mask:<24} | {__allbinds.all()[i].all()[j].hits:<4}') reply("-"*78) -__allbinds.dcc.add(mask='pybinds', callback=print_all) \ No newline at end of file +__allbinds.dcc.add(mask='pybinds', callback=print_all) From 126a9921ce7bbe161fda58a29436403a57feb95f Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Tue, 17 Oct 2023 19:42:42 +0200 Subject: [PATCH 37/71] New .pyfile command to run a python file --- src/mod/python.mod/python.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index c1ca63b63..45525d5dc 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -273,6 +273,34 @@ static void cmd_pyexpr(struct userrec *u, int idx, char *par) { return; } +static void cmd_pyfile(struct userrec *u, int idx, char *par) { + char *result; + PyObject *pobj, *pstr; + FILE *fp; + + if (!par[0]) { + dprintf(idx, "Usage: pyfile \n"); + return; + } + if (!(fp = fopen(par, "r"))) { + dprintf(idx, "Error: could not open file %s: %s\n", par, strerror(errno)); + return; + } + + PyErr_Clear(); + pobj = PyRun_FileEx(fp, par, 0, Py_file_input, pglobals, pglobals); + if (pobj) { + pstr = PyObject_Str(pobj); + + dprintf(idx, "%s\n", PyUnicode_AsUTF8(pstr)); + Py_DECREF(pstr); + Py_DECREF(pobj); + } else if (PyErr_Occurred()) { + PyErr_Print(); + } + return; +} + static void cmd_pysource(struct userrec *u, int idx, char *par) { if (!par[0]) { dprintf(idx, "Usage: pysource [args]\n"); @@ -304,6 +332,7 @@ static cmd_t mydcc[] = { {"pysource", "", (IntFunc) cmd_pysource, NULL}, {"python", "", (IntFunc) cmd_python, NULL}, {"pyexpr", "", (IntFunc) cmd_pyexpr, NULL}, + {"pyfile", "", (IntFunc) cmd_pyfile, NULL}, {NULL, NULL, NULL, NULL} /* Mark end. */ }; From 537240f494cb83eaaf5794b8f52935e43cd2004e Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Tue, 17 Oct 2023 20:18:18 +0200 Subject: [PATCH 38/71] RunFile require last argument to close file --- src/mod/python.mod/python.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 45525d5dc..965b63d83 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -288,7 +288,7 @@ static void cmd_pyfile(struct userrec *u, int idx, char *par) { } PyErr_Clear(); - pobj = PyRun_FileEx(fp, par, 0, Py_file_input, pglobals, pglobals); + pobj = PyRun_FileEx(fp, par, 0, Py_file_input, pglobals, pglobals, 1); if (pobj) { pstr = PyObject_Str(pobj); From c481c01c6f07803b77b50ff86a2230850ebb125c Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Tue, 17 Oct 2023 20:21:02 +0200 Subject: [PATCH 39/71] Fix Py_RunFile arguments --- src/mod/python.mod/python.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 965b63d83..6c8c2b3cc 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -288,7 +288,7 @@ static void cmd_pyfile(struct userrec *u, int idx, char *par) { } PyErr_Clear(); - pobj = PyRun_FileEx(fp, par, 0, Py_file_input, pglobals, pglobals, 1); + pobj = PyRun_FileEx(fp, par, Py_file_input, pglobals, pglobals, 1); if (pobj) { pstr = PyObject_Str(pobj); From 962807424e4f02b6e2938abf9c38c1042f31d7a3 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Tue, 24 Oct 2023 02:56:25 +0200 Subject: [PATCH 40/71] Fix python example, add Tcl calling layer --- src/mod/python.mod/example.py | 35 ++++++++++ src/mod/python.mod/pycmds.c | 120 +++++++++++++++++++--------------- src/mod/python.mod/python.c | 54 +-------------- 3 files changed, 104 insertions(+), 105 deletions(-) create mode 100644 src/mod/python.mod/example.py diff --git a/src/mod/python.mod/example.py b/src/mod/python.mod/example.py new file mode 100644 index 000000000..82a785d68 --- /dev/null +++ b/src/mod/python.mod/example.py @@ -0,0 +1,35 @@ +import requests +from eggdrop import bind, putmsg, findircuser +from bs4 import BeautifulSoup +from pprint import pprint + +def pubGetTitle(nick, host, handle, channel, text, **kwargs): + try: + reqs = requests.get(text) + soup = BeautifulSoup(reqs.text, 'html.parser') + putmsg(channel, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) + except Exception as e: + putmsg(channel, "Error: " + str(e)) + +# Called from pub or msg, responds public or privately +def mypub(nick, host, handle, channel, text, **kwargs): + putmsg(channel, f"{nick}, you said !moo") + +def joinGreetUser(nick, host, handle, channel, **kwargs): + putmsg(channel, f"Hello {nick}, welcome to {channel}") + +def joinGreetOp(nick, host, handle, channel, **kwargs): + putmsg(channel, f"Hello {nick}, welcome to {channel}, you are an operator") + +badwords = ['thommey', 'eggdrop', 'python'] +def checkWords(nick, host, handle, channel, text, **kwargs): + for word in badwords: + if word in text: + putmsg(channel, f"I'm banning you, {nick}, for saying {word}") + break + +bind("pub", "*", "!moo", mypub) +bind("join", "*", "*", joinGreetUser) +bind("join", "*", "*", joinGreetOp) +bind("pubm", "*", "*", checkWords) +bind("pub", "*", "!title", pubGetTitle) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 7064ae2d2..f2d9341da 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -11,22 +11,17 @@ struct py_bind { struct py_bind *next; }; +typedef struct { + PyObject_HEAD + char tclcmdname[512]; +} TclFunc; + +static PyTypeObject TclFuncType; + static struct py_bind *py_bindlist; static PyObject *EggdropError; //create static Python Exception object -static PyObject *testcmd(PyObject *self, PyObject *args) { -//PyDict_Type - PyObject *testdict = PyDict_New(); -// dprintf(LOG_SERV, "this is a thing"); -// fatal("eggdrop"); - - PyDict_SetItemString(testdict, "return", PyUnicode_FromString("this is the return")); -// PyDict_SetItemString(testdict, "code", 0); - - return testdict; -} - static PyObject *py_ircsend(PyObject *self, PyObject *args) { char *text; int queuenum; @@ -91,13 +86,12 @@ static int tcl_call_python(ClientData cd, Tcl_Interp *irp, int objc, Tcl_Obj *co return TCL_OK; } - static PyObject *py_bind(PyObject *self, PyObject *args) { PyObject *callback; char *bindtype, *mask, *flags; struct py_bind *bindinfo; tcl_bind_list_t *tl; - + // type flags mask callback if (!PyArg_ParseTuple(args, "sssO", &bindtype, &flags, &mask, &callback) || !callback) { PyErr_SetString(EggdropError, "wrong arguments"); @@ -130,12 +124,57 @@ static PyObject *py_bind(PyObject *self, PyObject *args) { Py_RETURN_NONE; } +static PyObject *python_call_tcl(PyObject *self, PyObject *args, PyObject *kwargs) { + size_t written = 0; + TclFunc *tf = (TclFunc *)self; + Py_ssize_t argc = PyTuple_Size(args); + Tcl_DString ds; + const char *result; + int retcode; + + Tcl_DStringInit(&ds); + Tcl_DStringAppendElement(&ds, tf->tclcmdname); + for (int i = 0; i < argc; i++) { + Tcl_DStringAppendElement(&ds, PyUnicode_AsUTF8(PyTuple_GetItem(args, i))); + } + retcode = Tcl_Eval(tclinterp, Tcl_DStringValue(&ds)); + + if (retcode != TCL_OK) { + PyErr_Format(EggdropError, "Tcl error: %s", Tcl_GetStringResult(tclinterp)); + return NULL; + } + result = Tcl_GetStringResult(tclinterp); + putlog(LOG_MISC, "*", "Python called '%s' -> '%s'", Tcl_DStringValue(&ds), result); + + return PyUnicode_DecodeUTF8(result, strlen(result), NULL); +} + +static PyObject *py_findtclfunc(PyObject *self, PyObject *args) { + Tcl_Command tclcmd; + char *cmdname; + TclFunc *result; + struct py_tcl_func *entry; + + if (!PyArg_ParseTuple(args, "s", &cmdname)) { + PyErr_SetString(EggdropError, "wrong arguments"); + return NULL; + } + // TODO: filter a bit better what is available to Python, specify return types ("list of string"), etc. + if (!(tclcmd = Tcl_FindCommand(tclinterp, cmdname, NULL, TCL_GLOBAL_ONLY))) { + PyErr_SetString(PyExc_AttributeError, cmdname); + return NULL; + } + result = PyObject_New(TclFunc, &TclFuncType); + strcpy(result->tclcmdname, cmdname); + return (PyObject *)result; +} static PyMethodDef MyPyMethods[] = { - {"testcmd", testcmd, METH_VARARGS, "A test dict"}, {"ircsend", py_ircsend, METH_VARARGS, "Send message to server"}, {"bind", py_bind, METH_VARARGS, "register an eggdrop python bind"}, {"findircuser", py_findircuser, METH_VARARGS, "find an IRC user by nickname and optional channel"}, + {"__getattr__", py_findtclfunc, METH_VARARGS, "fallback to call Tcl functions transparently"}, + // TODO: __dict__ with all valid Tcl commands {NULL, NULL, 0, NULL} /* Sentinel */ }; @@ -148,6 +187,17 @@ static struct PyModuleDef eggdrop = { MyPyMethods }; +static PyTypeObject TclFuncType = { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name = "eggdrop.TclFunc", + .tp_doc = "Tcl function that is callable from Python.", + .tp_basicsize = sizeof(TclFunc), + .tp_itemsize = 0, + .tp_flags = Py_TPFLAGS_DEFAULT, + .tp_new = PyType_GenericNew, + .tp_call = python_call_tcl, +}; + PyMODINIT_FUNC PyInit_eggdrop(void) { PyObject *pymodobj; @@ -156,48 +206,14 @@ PyMODINIT_FUNC PyInit_eggdrop(void) { return NULL; EggdropError = PyErr_NewException("eggdrop.error", NULL, NULL); - Py_XINCREF(EggdropError); + Py_INCREF(EggdropError); if (PyModule_AddObject(pymodobj, "error", EggdropError) < 0) { - Py_XDECREF(EggdropError); + Py_DECREF(EggdropError); Py_CLEAR(EggdropError); Py_DECREF(pymodobj); return NULL; } - - PyModule_AddIntConstant(pymodobj, "USER_AUTOOP", 0x00000001); - PyModule_AddIntConstant(pymodobj, "USER_BOT", 0x00000002); - PyModule_AddIntConstant(pymodobj, "USER_COMMON", 0x00000004); - PyModule_AddIntConstant(pymodobj, "USER_DEOP", 0x00000008); - PyModule_AddIntConstant(pymodobj, "USER_EXEMPT", 0x00000010); - PyModule_AddIntConstant(pymodobj, "USER_FRIEND", 0x00000020); - PyModule_AddIntConstant(pymodobj, "USER_GVOICE", 0x00000040); - PyModule_AddIntConstant(pymodobj, "USER_HIGHLITE", 0x00000080); - PyModule_AddIntConstant(pymodobj, "USER_JANITOR", 0x00000200); - PyModule_AddIntConstant(pymodobj, "USER_KICK", 0x00000400); - PyModule_AddIntConstant(pymodobj, "USER_HALFOP", 0x00000800); - PyModule_AddIntConstant(pymodobj, "USER_MASTER", 0x00001000); - PyModule_AddIntConstant(pymodobj, "USER_OWNER", 0x00002000); - PyModule_AddIntConstant(pymodobj, "USER_OP", 0x00004000); - PyModule_AddIntConstant(pymodobj, "USER_PARTY", 0x00008000); - PyModule_AddIntConstant(pymodobj, "USER_QUIET", 0x00010000); - PyModule_AddIntConstant(pymodobj, "USER_DEHALFOP", 0x00020000); - PyModule_AddIntConstant(pymodobj, "USER_BOTMAST", 0x00080000); - PyModule_AddIntConstant(pymodobj, "USER_UNSHARED", 0x00100000); - PyModule_AddIntConstant(pymodobj, "USER_VOICE", 0x00200000); - PyModule_AddIntConstant(pymodobj, "USER_WASOPTEST", 0x00400000); - PyModule_AddIntConstant(pymodobj, "USER_XFER", 0x00800000); - PyModule_AddIntConstant(pymodobj, "USER_AUTOHALFOP", 0x01000000); - PyModule_AddIntConstant(pymodobj, "USER_WASHALFOPTEST", 0x02000000); - - PyModule_AddIntConstant(pymodobj, "QUEUE_STDOUT", 0x7FF1); - PyModule_AddIntConstant(pymodobj, "QUEUE_LOG", 0x7FF2); - PyModule_AddIntConstant(pymodobj, "QUEUE_SERVER", 0x7FF3); - PyModule_AddIntConstant(pymodobj, "QUEUE_HELP", 0x7FF4); - PyModule_AddIntConstant(pymodobj, "QUEUE_STDERR", 0x7FF5); - PyModule_AddIntConstant(pymodobj, "QUEUE_MODE", 0x7FF6); - PyModule_AddIntConstant(pymodobj, "QUEUE_MODE_NEXT", 0x7FF7); - PyModule_AddIntConstant(pymodobj, "QUEUE_SERVER_NEXT", 0x7FF8); - PyModule_AddIntConstant(pymodobj, "QUEUE_HELP_NEXT", 0x7FF9); + PyType_Ready(&TclFuncType); return pymodobj; } diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 6c8c2b3cc..fc64c3185 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -63,58 +63,6 @@ static int python_expmem() return size; } -int py_pubm (char *nick, char *host, char *hand, char *chan, char *text) { - PyObject *pArgs; - char buf[UHOSTLEN]; - struct chanset_t *ch; - struct userrec *u; - struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; - - if (!(ch = findchan_by_dname(chan))) { - putlog(LOG_MISC, "*", "Python: Cannot find pubm channel %s", chan); - return 1; - } - snprintf(buf, sizeof buf, "%s!%s", nick, host); - if ((u = get_user_by_host(buf))) { - get_user_flagrec(u, &fr, chan); - } - if (!(pArgs = Py_BuildValue("(skkksssss)", "pubm", (unsigned long)fr.global, (unsigned long)fr.chan, (unsigned long)fr.bot, nick, host, hand, chan, text))) { - putlog(LOG_MISC, "*", "Python: Cannot convert pubm arguments"); - return 1; - } - return runPythonPyArgs("eggdroppy.binds", "on_event", pArgs); -} - -int py_join (char *nick, char *host, char *hand, char *chan) { - PyObject *pArgs; - char buf[UHOSTLEN]; - struct chanset_t *ch; - struct userrec *u; - struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; - - if (!(ch = findchan_by_dname(chan))) { - putlog(LOG_MISC, "*", "Python: Cannot find pubm channel %s", chan); - return 1; - } - snprintf(buf, sizeof buf, "%s!%s", nick, host); - if ((u = get_user_by_host(buf))) { - get_user_flagrec(u, &fr, chan); - } - if (!(pArgs = Py_BuildValue("(skkkssss)", "join", (unsigned long)fr.global, (unsigned long)fr.chan, (unsigned long)fr.bot, nick, host, hand, chan))) { - putlog(LOG_MISC, "*", "Python: Cannot convert join arguments"); - return 1; - } - return runPythonPyArgs("eggdroppy.binds", "on_event", pArgs); -} - -int py_msgm (char *nick, char *hand, char *host, char *text) { -// struct flag_record fr = { FR_CHAN | FR_ANYWH | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0 }; - char *argv[] = {"msgm", nick, host, hand, text}; - - runPythonArgs("eggdroppy.binds", "on_event", ARRAYCOUNT(argv), argv); - return 0; -} - static void init_python() { PyObject *pmodule; wchar_t *program = Py_DecodeLocale("eggdrop", NULL); @@ -133,7 +81,7 @@ static void init_python() { pmodule = PyImport_ImportModule("eggdrop"); if (!pmodule) { PyErr_Print(); - fprintf(stderr, "Error: could not import module 'spam'\n"); + fprintf(stderr, "Error: could not import module 'eggdrop'\n"); } pirp = PyImport_AddModule("__main__"); From 5f304c459a23a3833d18a26357ef62362612d36c Mon Sep 17 00:00:00 2001 From: Geo Date: Mon, 23 Oct 2023 21:53:52 -0400 Subject: [PATCH 41/71] Remove unused vars --- src/mod/python.mod/pycmds.c | 2 -- src/mod/python.mod/python.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index f2d9341da..bc36eb11c 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -125,7 +125,6 @@ static PyObject *py_bind(PyObject *self, PyObject *args) { } static PyObject *python_call_tcl(PyObject *self, PyObject *args, PyObject *kwargs) { - size_t written = 0; TclFunc *tf = (TclFunc *)self; Py_ssize_t argc = PyTuple_Size(args); Tcl_DString ds; @@ -153,7 +152,6 @@ static PyObject *py_findtclfunc(PyObject *self, PyObject *args) { Tcl_Command tclcmd; char *cmdname; TclFunc *result; - struct py_tcl_func *entry; if (!PyArg_ParseTuple(args, "s", &cmdname)) { PyErr_SetString(EggdropError, "wrong arguments"); diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index fc64c3185..bf284cf03 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -203,7 +203,6 @@ static void cmd_python(struct userrec *u, int idx, char *par) { } static void cmd_pyexpr(struct userrec *u, int idx, char *par) { -// char *result; PyObject *pobj, *pstr; PyErr_Clear(); @@ -222,7 +221,6 @@ static void cmd_pyexpr(struct userrec *u, int idx, char *par) { } static void cmd_pyfile(struct userrec *u, int idx, char *par) { - char *result; PyObject *pobj, *pstr; FILE *fp; From 2145546bf18f63b4fde08209937241dcd67ea0e0 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Wed, 1 Nov 2023 18:41:40 +0100 Subject: [PATCH 42/71] Change CFLAGS order so CFLAGS=-O0 can override Python defaults --- src/mod/python.mod/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod/python.mod/Makefile.in b/src/mod/python.mod/Makefile.in index 2b5285057..8d9b0da21 100644 --- a/src/mod/python.mod/Makefile.in +++ b/src/mod/python.mod/Makefile.in @@ -15,10 +15,10 @@ static: ../python.o modules: ../../../python.$(MOD_EXT) ../python.o: - $(CC) $(CFLAGS) $(CPPFLAGS) $(PYTHON_CFLAGS) -DMAKING_MODS -c $(srcdir)/python.c && mv -f python.o ../ + $(CC) $(PYTHON_CFLAGS) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/python.c && mv -f python.o ../ ../../../python.$(MOD_EXT): ../python.o - $(LD) $(CFLAGS) -o ../../../python.$(MOD_EXT) ../python.o $(PYTHON_CFLAGS) $(PYTHON_LDFLAGS) $(XLIBS) $(MODULE_XLIBS) && $(STRIP) ../../../python.$(MOD_EXT) + $(LD) $(PYTHON_CFLAGS) $(CFLAGS) -o ../../../python.$(MOD_EXT) ../python.o $(PYTHON_LDFLAGS) $(XLIBS) $(MODULE_XLIBS) && $(STRIP) ../../../python.$(MOD_EXT) depend: $(CC) $(CFLAGS) -MM $(srcdir)/python.c -MT ../python.o > .depend From 1d5d68e861af38abc5a4f5804e8f389c43fda4a1 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Wed, 1 Nov 2023 18:42:04 +0100 Subject: [PATCH 43/71] Tcl dict/list conversions, move to eggdrop.tcl module - Python objects are now automatically converted to Tcl strings when calling Tcl functions - Tcl functions reside in eggdrop.tcl - New functions parse_tcl_list/parse_tcl_dict to convert Tcl list/dict to Python list/dict --- src/mod/python.mod/pycmds.c | 140 ++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 5 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index bc36eb11c..4a89ea686 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -22,6 +22,8 @@ static struct py_bind *py_bindlist; static PyObject *EggdropError; //create static Python Exception object +static Tcl_Obj *py_to_tcl_obj(PyObject *o); // generic conversion function + static PyObject *py_ircsend(PyObject *self, PyObject *args) { char *text; int queuenum; @@ -86,6 +88,63 @@ static int tcl_call_python(ClientData cd, Tcl_Interp *irp, int objc, Tcl_Obj *co return TCL_OK; } +static PyObject *py_parse_tcl_list(PyObject *self, PyObject *args) { + int max; + const char *str; + Tcl_Obj *strobj; + PyObject *result; + + if (!PyArg_ParseTuple(args, "s", &str)) { + PyErr_SetString(PyExc_TypeError, "Argument is not a unicode string"); + return NULL; + } + strobj = Tcl_NewStringObj(str, -1); + Tcl_IncrRefCount(strobj); + if (Tcl_ListObjLength(tclinterp, strobj, &max) != TCL_OK) { + Tcl_DecrRefCount(strobj); + PyErr_SetString(EggdropError, "Supplied string is not a Tcl list"); + } + result = PyList_New(max); + for (int i = 0; i < max; i++) { + Tcl_Obj *tclobj; + const char *tclstr; + int tclstrlen; + + Tcl_ListObjIndex(tclinterp, strobj, i, &tclobj); + tclstr = Tcl_GetStringFromObj(tclobj, &tclstrlen); + PyList_SetItem(result, i, PyUnicode_DecodeUTF8(tclstr, tclstrlen, NULL)); + } + Tcl_DecrRefCount(strobj); + return result; +} + +static PyObject *py_parse_tcl_dict(PyObject *self, PyObject *args) { + int done; + const char *str; + Tcl_Obj *strobj, *key, *value; + Tcl_DictSearch search; + PyObject *result; + + if (!PyArg_ParseTuple(args, "s", &str)) { + PyErr_SetString(PyExc_TypeError, "Argument is not a unicode string"); + return NULL; + } + strobj = Tcl_NewStringObj(str, -1); + if (Tcl_DictObjFirst(tclinterp, strobj, &search, &key, &value, &done) != TCL_OK) { + PyErr_SetString(EggdropError, "Supplied string is not a Tcl dictionary"); + } + result = PyDict_New(); + while (!done) { + int len; + const char *valstr = Tcl_GetStringFromObj(value, &len); + PyObject *pyval = PyUnicode_DecodeUTF8(valstr, len, NULL); + PyDict_SetItemString(result, Tcl_GetString(key), pyval); + Tcl_DictObjNext(&search, &key, &value, &done); + } + Tcl_DictObjDone(&search); + return result; +} + static PyObject *py_bind(PyObject *self, PyObject *args) { PyObject *callback; char *bindtype, *mask, *flags; @@ -124,6 +183,59 @@ static PyObject *py_bind(PyObject *self, PyObject *args) { Py_RETURN_NONE; } +static Tcl_Obj *py_list_to_tcl_obj(PyObject *o) { + int max = PyList_GET_SIZE(o); + Tcl_Obj *result = Tcl_NewListObj(0, NULL); + + for (int i = 0; i < max; i++) { + Tcl_ListObjAppendElement(tclinterp, result, py_to_tcl_obj(PyList_GET_ITEM(o, i))); + } + return result; +} + +static Tcl_Obj *py_tuple_to_tcl_obj(PyObject *o) { + int max = PyTuple_GET_SIZE(o); + Tcl_Obj *result = Tcl_NewListObj(0, NULL); + + for (int i = 0; i < max; i++) { + Tcl_ListObjAppendElement(tclinterp, result, py_to_tcl_obj(PyTuple_GET_ITEM(o, i))); + } + return result; +} + +static Tcl_Obj *py_dict_to_tcl_obj(PyObject *o) { + int max; + Tcl_Obj *result = Tcl_NewDictObj(); + + /* operate on list of (key, value) tuples instead */ + o = PyDict_Items(o); + max = PyList_GET_SIZE(o); + for (int i = 0; i < max; i++) { + PyObject *key = PyTuple_GET_ITEM(PyList_GET_ITEM(o, i), 0); + PyObject *val = PyTuple_GET_ITEM(PyList_GET_ITEM(o, i), 1); + Tcl_Obj *keyobj = py_to_tcl_obj(key); + Tcl_Obj *valobj = py_to_tcl_obj(val); + Tcl_DictObjPut(tclinterp, result, keyobj, valobj); + } + return result; +} + +static Tcl_Obj *py_str_to_tcl_obj(PyObject *o) { + return Tcl_NewStringObj(PyUnicode_AsUTF8(o), -1); +} + +static Tcl_Obj *py_to_tcl_obj(PyObject *o) { + if (PyList_Check(o)) { + return py_list_to_tcl_obj(o); + } else if (PyDict_Check(o)) { + return py_dict_to_tcl_obj(o); + } else if (PyTuple_Check(o)) { + return py_tuple_to_tcl_obj(o); + } else { + return py_str_to_tcl_obj(o); + } +} + static PyObject *python_call_tcl(PyObject *self, PyObject *args, PyObject *kwargs) { TclFunc *tf = (TclFunc *)self; Py_ssize_t argc = PyTuple_Size(args); @@ -134,7 +246,8 @@ static PyObject *python_call_tcl(PyObject *self, PyObject *args, PyObject *kwarg Tcl_DStringInit(&ds); Tcl_DStringAppendElement(&ds, tf->tclcmdname); for (int i = 0; i < argc; i++) { - Tcl_DStringAppendElement(&ds, PyUnicode_AsUTF8(PyTuple_GetItem(args, i))); + PyObject *o = PyTuple_GetItem(args, i); + Tcl_DStringAppendElement(&ds, Tcl_GetString(py_to_tcl_obj(o))); } retcode = Tcl_Eval(tclinterp, Tcl_DStringValue(&ds)); @@ -171,20 +284,28 @@ static PyMethodDef MyPyMethods[] = { {"ircsend", py_ircsend, METH_VARARGS, "Send message to server"}, {"bind", py_bind, METH_VARARGS, "register an eggdrop python bind"}, {"findircuser", py_findircuser, METH_VARARGS, "find an IRC user by nickname and optional channel"}, - {"__getattr__", py_findtclfunc, METH_VARARGS, "fallback to call Tcl functions transparently"}, - // TODO: __dict__ with all valid Tcl commands {NULL, NULL, 0, NULL} /* Sentinel */ }; +static PyMethodDef EggTclMethods[] = { + // TODO: __dict__ with all valid Tcl commands? + {"__getattr__", py_findtclfunc, METH_VARARGS, "fallback to call Tcl functions transparently"}, + {"parse_tcl_list", py_parse_tcl_list, METH_VARARGS, "convert a Tcl list string to a Python list"}, + {"parse_tcl_dict", py_parse_tcl_dict, METH_VARARGS, "convert a Tcl dict string to a Python dict"}, + {NULL, NULL, 0, NULL} +}; + static struct PyModuleDef eggdrop = { PyModuleDef_HEAD_INIT, - "eggdrop", /* name of module */ + "eggdrop", /* name of module */ 0, /* module documentation, may be NULL */ -1, /* size of per-interpreter state of the module, or -1 if the module keeps state in global variables. */ MyPyMethods }; +static struct PyModuleDef eggdrop_tcl = { PyModuleDef_HEAD_INIT, "eggdrop.tcl", NULL, -1, EggTclMethods }; + static PyTypeObject TclFuncType = { PyVarObject_HEAD_INIT(NULL, 0) .tp_name = "eggdrop.TclFunc", @@ -197,7 +318,7 @@ static PyTypeObject TclFuncType = { }; PyMODINIT_FUNC PyInit_eggdrop(void) { - PyObject *pymodobj; + PyObject *pymodobj, *eggtclmodobj, *pymoddict; pymodobj = PyModule_Create(&eggdrop); if (pymodobj == NULL) @@ -211,6 +332,15 @@ PyMODINIT_FUNC PyInit_eggdrop(void) { Py_DECREF(pymodobj); return NULL; } + eggtclmodobj = PyModule_Create(&eggdrop_tcl); + PyModule_AddObject(pymodobj, "tcl", eggtclmodobj); + + pymoddict = PyModule_GetDict(pymodobj); + PyDict_SetItemString(pymoddict, "tcl", eggtclmodobj); + + pymoddict = PyImport_GetModuleDict(); + PyDict_SetItemString(pymoddict, "eggdrop.tcl", eggtclmodobj); + PyType_Ready(&TclFuncType); return pymodobj; From 2b6c0ec737d390c9d7817b4ea3e5edd343a902fa Mon Sep 17 00:00:00 2001 From: Geo Date: Fri, 3 Nov 2023 09:50:01 -0400 Subject: [PATCH 44/71] start documentation --- doc/sphinx_source/modules/mod/python.rst | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 doc/sphinx_source/modules/mod/python.rst diff --git a/doc/sphinx_source/modules/mod/python.rst b/doc/sphinx_source/modules/mod/python.rst new file mode 100644 index 000000000..e98d73575 --- /dev/null +++ b/doc/sphinx_source/modules/mod/python.rst @@ -0,0 +1,49 @@ +Last revised: November 03, 2023 + +.. _python: + +============ +Python Module +============ + +This module adds a Python interpreter to Eggdrop, allowing you to run Python scripts. + +-------------- +Loading Python +-------------- + +Put this line into your Eggdrop configuration file to load the python module:: + + loadmodule python + +To load a python script from your config file, place the .py file in the scripts/ folder and add the following line to your config:: + + pysource scripts/myscript.py + +------------------ +Partyline Commands +------------------ + +You can run a python command from the partyline with the .py command, such as:: + + .py print('Hello world!') + +---------------- +Config variables +---------------- + +There are also some variables you can set in your config file: + + set allow-resync 0 + When two bots get disconnected, this setting allows them to create a + resync buffer which saves all changes done to the userfile during + the disconnect. When they reconnect, they will not have to transfer + the complete user file, but, instead, just send the resync buffer. + +----------------------- +Eggdrop Python Commands +----------------------- + + The Python module is built to use the existing core Tcl commands integrated into Eggdrop via the ``eggdrop`` module. To use + +Copyright (C) 2000 - 2023 Eggheads Development Team From 9f6a3a10a8916b9848d80f59b74645e58cacd458 Mon Sep 17 00:00:00 2001 From: Geo Date: Sun, 12 Nov 2023 13:09:33 -0500 Subject: [PATCH 45/71] Add tclpython to Makefile.in --- src/mod/python.mod/Makefile.in | 1 + src/mod/python.mod/python.c | 3 +++ src/mod/python.mod/tclpython.c | 35 ++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 src/mod/python.mod/tclpython.c diff --git a/src/mod/python.mod/Makefile.in b/src/mod/python.mod/Makefile.in index 8d9b0da21..46d4376ad 100644 --- a/src/mod/python.mod/Makefile.in +++ b/src/mod/python.mod/Makefile.in @@ -43,4 +43,5 @@ distclean: clean ../../../src/mod/modvals.h ../../../src/tandem.h \ ../../../src/mod/irc.mod/irc.h ../../../src/mod/server.mod/server.h \ ../../../src/mod/python.mod/python.h \ + ../../../src/mod/python.mod/tclpython.c \ ../../../src/mod/python.mod/pycmds.c diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index bf284cf03..2b0f32cf3 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -39,6 +39,7 @@ #include "src/mod/irc.mod/irc.h" #include "src/mod/server.mod/server.h" #include "src/mod/python.mod/python.h" +#include "src/mod/python.mod/tclpython.c" #undef global static Function *global = NULL, *irc_funcs = NULL; @@ -287,6 +288,7 @@ static char *python_close() Context; kill_python(); rem_builtins(H_dcc, mydcc); + rem_tcl_commands(my_tcl_cmds); module_undepend(MODULE_NAME); return NULL; } @@ -330,5 +332,6 @@ char *python_start(Function *global_funcs) /* Add command table to bind list */ add_builtins(H_dcc, mydcc); + add_tcl_commands(my_tcl_cmds); return NULL; } diff --git a/src/mod/python.mod/tclpython.c b/src/mod/python.mod/tclpython.c new file mode 100644 index 000000000..b297c8534 --- /dev/null +++ b/src/mod/python.mod/tclpython.c @@ -0,0 +1,35 @@ +/* + * tclpython.c -- part of python.mod + * contains all tcl functions + * + */ +/* + * Copyright (C) 2000 - 2023 Eggheads Development Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +static int tcl_pysource STDVAR +{ + BADARGS(2, 2, " script"); + + putlog(LOG_MISC, "*", "mebbe trying to load %s", argv[1]); +// PyImport_ImportModule(argv[1]); +} + +static tcl_cmds my_tcl_cmds[] = { + {"pysource", tcl_pysource}, + {NULL, NULL} +}; From 303e2541e8c27826116adfaf1580c53ad8f8e18d Mon Sep 17 00:00:00 2001 From: Geo Date: Mon, 13 Nov 2023 17:26:59 -0500 Subject: [PATCH 46/71] Finish Tcl pysource, update example.py --- src/mod/python.mod/example.py | 19 ++++++++++++++++++- src/mod/python.mod/python.c | 11 +++++------ src/mod/python.mod/tclpython.c | 20 ++++++++++++++++++-- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/mod/python.mod/example.py b/src/mod/python.mod/example.py index 82a785d68..1bb64fb9d 100644 --- a/src/mod/python.mod/example.py +++ b/src/mod/python.mod/example.py @@ -1,7 +1,9 @@ import requests -from eggdrop import bind, putmsg, findircuser +from eggdrop import bind, findircuser +from eggdrop.tcl import putmsg from bs4 import BeautifulSoup from pprint import pprint +from imdb import Cinemagoer def pubGetTitle(nick, host, handle, channel, text, **kwargs): try: @@ -28,8 +30,23 @@ def checkWords(nick, host, handle, channel, text, **kwargs): putmsg(channel, f"I'm banning you, {nick}, for saying {word}") break +def pubGetMovie(nick, user, hand, chan, text, **kwargs): + imdb = Cinemagoer() + putlog(text) + results = imdb.search_movie(text) + movie = imdb.get_movie(results[0].movieID) +# result = imdb.get_movie('0133093') +# putlog(result) +# putmsg(chan, f"-= {result[0]['title']} ({result[0]['year']}). {result[0]['rating']}. {result[0]['plot outline']}") +# putlog(f"plot: {results[0]['plot outline'] +# putlog(f"Movie is {results[0]['title']}") + putmsg(chan, f"Movie: {movie['title']} ({movie['year']}): {movie['plot outline']}") + bind("pub", "*", "!moo", mypub) bind("join", "*", "*", joinGreetUser) bind("join", "*", "*", joinGreetOp) bind("pubm", "*", "*", checkWords) bind("pub", "*", "!title", pubGetTitle) +bind("pub", "*", "!movie", pubGetMovie) + +print('Loaded example.py') diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 2b0f32cf3..1fcf812eb 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -39,14 +39,14 @@ #include "src/mod/irc.mod/irc.h" #include "src/mod/server.mod/server.h" #include "src/mod/python.mod/python.h" -#include "src/mod/python.mod/tclpython.c" + +//static PyObject *pymodobj; +static PyObject *pirp, *pglobals; #undef global static Function *global = NULL, *irc_funcs = NULL; #include "src/mod/python.mod/pycmds.c" - -//static PyObject *pymodobj; -static PyObject *pirp, *pglobals; +#include "src/mod/python.mod/tclpython.c" //extern p_tcl_bind_list H_pubm; @@ -222,8 +222,8 @@ static void cmd_pyexpr(struct userrec *u, int idx, char *par) { } static void cmd_pyfile(struct userrec *u, int idx, char *par) { - PyObject *pobj, *pstr; FILE *fp; + PyObject *pobj, *pstr; if (!par[0]) { dprintf(idx, "Usage: pyfile \n"); @@ -233,7 +233,6 @@ static void cmd_pyfile(struct userrec *u, int idx, char *par) { dprintf(idx, "Error: could not open file %s: %s\n", par, strerror(errno)); return; } - PyErr_Clear(); pobj = PyRun_FileEx(fp, par, Py_file_input, pglobals, pglobals, 1); if (pobj) { diff --git a/src/mod/python.mod/tclpython.c b/src/mod/python.mod/tclpython.c index b297c8534..c198a460f 100644 --- a/src/mod/python.mod/tclpython.c +++ b/src/mod/python.mod/tclpython.c @@ -25,8 +25,24 @@ static int tcl_pysource STDVAR { BADARGS(2, 2, " script"); - putlog(LOG_MISC, "*", "mebbe trying to load %s", argv[1]); -// PyImport_ImportModule(argv[1]); + FILE *fp; + PyObject *pobj, *pstr; + + if (!(fp = fopen(argv[1], "r"))) { + Tcl_AppendResult(irp, "Error: could not open file ", argv[1],": ", strerror(errno), NULL); + return TCL_ERROR; + } + PyErr_Clear(); + pobj = PyRun_FileEx(fp, argv[1], Py_file_input, pglobals, pglobals, 1); + if (pobj) { + pstr = PyObject_Str(pobj); + Tcl_AppendResult(irp, PyUnicode_AsUTF8(pstr), NULL); + Py_DECREF(pstr); + Py_DECREF(pobj); + } else if (PyErr_Occurred()) { + PyErr_Print(); + } + return TCL_OK; } static tcl_cmds my_tcl_cmds[] = { From 2732fcf1882445eced03454544ef74fdda201a92 Mon Sep 17 00:00:00 2001 From: Geo Date: Mon, 13 Nov 2023 18:04:14 -0500 Subject: [PATCH 47/71] Move commands to pycmd --- src/mod/python.mod/pycmds.c | 24 +++++++++ src/mod/python.mod/python.c | 103 ------------------------------------ 2 files changed, 24 insertions(+), 103 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 4a89ea686..53408824c 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -37,6 +37,24 @@ static PyObject *py_ircsend(PyObject *self, PyObject *args) { Py_RETURN_NONE; } +static void cmd_python(struct userrec *u, int idx, char *par) { + PyObject *pobj, *pstr; + + PyErr_Clear(); + + pobj = PyRun_String(par, Py_eval_input, pglobals, pglobals); + if (pobj) { + pstr = PyObject_Str(pobj); + + dprintf(idx, "%s\n", PyUnicode_AsUTF8(pstr)); + Py_DECREF(pstr); + Py_DECREF(pobj); + } else if (PyErr_Occurred()) { + PyErr_Print(); + } + return; +} + static PyObject *make_ircuser_dict(memberlist *m) { PyObject *result = PyDict_New(); PyDict_SetItemString(result, "nick", PyUnicode_FromString(m->nick)); @@ -295,6 +313,12 @@ static PyMethodDef EggTclMethods[] = { {NULL, NULL, 0, NULL} }; +static cmd_t mydcc[] = { + /* command flags function tcl-name */ + {"python", "", (IntFunc) cmd_python, NULL}, + {NULL, NULL, NULL, NULL} /* Mark end. */ +}; + static struct PyModuleDef eggdrop = { PyModuleDef_HEAD_INIT, "eggdrop", /* name of module */ diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index 1fcf812eb..ecdd428b2 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -163,100 +163,6 @@ int runPythonArgs(const char *script, const char *method, int argc, char **argv) return runPythonPyArgs(script, method, pArgs); } -static void runPython(char *par) { - int maxargc = 16; - char **argv = NULL; - char *script = NULL, *method = NULL; - int argvidx = -2; - char *word; - - if (!argv) { - argv = nmalloc(maxargc * sizeof *argv); - } - for (word = strtok(par, " "); word; word = strtok(NULL, " ")) { - if (argvidx == -2) { - script = word; - } else if (argvidx == -1) { - method = word; - } else { - if (argvidx >= maxargc) { - maxargc += 16; - argv = nrealloc(argv, maxargc * sizeof *argv); - } - argv[argvidx] = word; - } - argvidx++; - } - if (argvidx < 0) { - fprintf(stderr, "Missing script/method for runPython\n"); - return; - } - runPythonArgs(script, method, argvidx, argv); -} - -static void cmd_python(struct userrec *u, int idx, char *par) { - PyErr_Clear(); - PyRun_String(par, Py_file_input, pglobals, pglobals); - if (PyErr_Occurred()) { - PyErr_Print(); - } - return; -} - -static void cmd_pyexpr(struct userrec *u, int idx, char *par) { - PyObject *pobj, *pstr; - - PyErr_Clear(); - - pobj = PyRun_String(par, Py_eval_input, pglobals, pglobals); - if (pobj) { - pstr = PyObject_Str(pobj); - - dprintf(idx, "%s\n", PyUnicode_AsUTF8(pstr)); - Py_DECREF(pstr); - Py_DECREF(pobj); - } else if (PyErr_Occurred()) { - PyErr_Print(); - } - return; -} - -static void cmd_pyfile(struct userrec *u, int idx, char *par) { - FILE *fp; - PyObject *pobj, *pstr; - - if (!par[0]) { - dprintf(idx, "Usage: pyfile \n"); - return; - } - if (!(fp = fopen(par, "r"))) { - dprintf(idx, "Error: could not open file %s: %s\n", par, strerror(errno)); - return; - } - PyErr_Clear(); - pobj = PyRun_FileEx(fp, par, Py_file_input, pglobals, pglobals, 1); - if (pobj) { - pstr = PyObject_Str(pobj); - - dprintf(idx, "%s\n", PyUnicode_AsUTF8(pstr)); - Py_DECREF(pstr); - Py_DECREF(pobj); - } else if (PyErr_Occurred()) { - PyErr_Print(); - } - return; -} - -static void cmd_pysource(struct userrec *u, int idx, char *par) { - if (!par[0]) { - dprintf(idx, "Usage: pysource [args]\n"); - return; - } - runPython(par); - - return; -} - /* A report on the module status. * * details is either 0 or 1: @@ -273,15 +179,6 @@ static void python_report(int idx, int details) } } -static cmd_t mydcc[] = { - /* command flags function tcl-name */ - {"pysource", "", (IntFunc) cmd_pysource, NULL}, - {"python", "", (IntFunc) cmd_python, NULL}, - {"pyexpr", "", (IntFunc) cmd_pyexpr, NULL}, - {"pyfile", "", (IntFunc) cmd_pyfile, NULL}, - {NULL, NULL, NULL, NULL} /* Mark end. */ -}; - static char *python_close() { Context; From b1b1eb2da7df36bb53c49f7549b40b7e3b14f35c Mon Sep 17 00:00:00 2001 From: Geo Date: Mon, 13 Nov 2023 18:11:39 -0500 Subject: [PATCH 48/71] Finish initial outline format for doc --- doc/sphinx_source/modules/mod/python.rst | 53 +++++++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/doc/sphinx_source/modules/mod/python.rst b/doc/sphinx_source/modules/mod/python.rst index e98d73575..b7235b17d 100644 --- a/doc/sphinx_source/modules/mod/python.rst +++ b/doc/sphinx_source/modules/mod/python.rst @@ -24,9 +24,29 @@ To load a python script from your config file, place the .py file in the scripts Partyline Commands ------------------ -You can run a python command from the partyline with the .py command, such as:: +^^^^^^^^^^^^^^^^^^^ +python +^^^^^^^^^^^^^^^^^^^ - .py print('Hello world!') +You can run a python command from the partyline with the .python command, such as:: + + .python print('Hello world!') + +^^^^^^^^^^^^^ +.binds python +^^^^^^^^^^^^^ + +The python module extends the core ``.binds`` command by adding a ``python`` mask. This command will list all binds for python scripts. + +------------ +Tcl Commands +------------ + +^^^^^^^^^^^^^^^^^^^^^^^ +pysource +^^^^^^^^^^^^^^^^^^^^^^^ + +The ``pysource`` command is analgous to the Tcl ``source`` command, except that it loads a Python script into Eggdrop instead of a Tcl script. ---------------- Config variables @@ -46,4 +66,33 @@ Eggdrop Python Commands The Python module is built to use the existing core Tcl commands integrated into Eggdrop via the ``eggdrop`` module. To use +-------------------------------- +Writing an Eggdrop Python script +-------------------------------- + + This is how to write a python script for Eggdrop. + +^^^^^^^^^^^^^^ +Header section +^^^^^^^^^^^^^^ + +An Eggdrop python script requires you to import X Y and Z, in this format. + +^^^^^^^^^^^^ +Code Section +^^^^^^^^^^^^ + +Normal python code works here. To run a command from the Eggdrop Tcl library, use this format. + +Use this format all over. + +------------------------------------- +Writing a module for use with Eggdrop +------------------------------------- + +This is how you import a module for use with an egg python script. + + + + Copyright (C) 2000 - 2023 Eggheads Development Team From 5dcdd672fae8710afc788c3ac66c7d2999fcb82c Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 14 Nov 2023 17:00:33 -0500 Subject: [PATCH 49/71] Add python and tcl types to bind Tcl command --- doc/sphinx_source/using/tcl-commands.rst | 2 ++ src/tclhash.c | 38 ++++++++++++++++-------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/doc/sphinx_source/using/tcl-commands.rst b/doc/sphinx_source/using/tcl-commands.rst index e928d0f61..cff20f667 100644 --- a/doc/sphinx_source/using/tcl-commands.rst +++ b/doc/sphinx_source/using/tcl-commands.rst @@ -2248,6 +2248,8 @@ unbind binds [type/mask] ^^^^^^^^^^^^^^^^^ + Description: By default, lists Tcl binds registered with the Eggdrop. You can specify 'all' to view all binds, 'tcl' to view Tcl binds, and 'python' to view Python binds. Alternately, you can specify a bind type (pub, msg, etc) to view all binds that match that type of bind, or a mask that is matched against the command associated with the bind. + Returns: a list of Tcl binds, each item in the list is a sublist of five elements: { } diff --git a/src/tclhash.c b/src/tclhash.c index 41f959fae..5b1626378 100644 --- a/src/tclhash.c +++ b/src/tclhash.c @@ -1261,6 +1261,7 @@ void tell_binds(int idx, char *par) tcl_bind_list_t *tl, *tl_kind; tcl_bind_mask_t *tm; int fnd = 0, showall = 0, patmatc = 0, maxname = 0; + int ok = 0, showpy = 0, showtcl = 0; tcl_cmd_t *tc; char *name, *proc, *s, flg[100]; @@ -1281,7 +1282,13 @@ void tell_binds(int idx, char *par) if ((name && name[0] && !strcasecmp(name, "all")) || (s && s[0] && !strcasecmp(s, "all"))) showall = 1; - if (tl_kind == NULL && name && name[0] && strcasecmp(name, "all")) + if ((name && name[0] && !strcasecmp(name, "tcl")) || + (s && s[0] && !strcasecmp(s, "all"))) + showtcl = 1; + if ((name && name[0] && !strcasecmp(name, "python")) || + (s && s[0] && !strcasecmp(s, "all"))) + showpy = 1; + if (tl_kind == NULL && !showpy && !showtcl && name && name[0] && strcasecmp(name, "all")) patmatc = 1; for (tl = tl_kind ? tl_kind : bind_table_list; tl; @@ -1303,7 +1310,6 @@ void tell_binds(int idx, char *par) dprintf(idx, MISC_CMDBINDS); dprintf(idx, " %+*s FLAGS COMMAND HITS BINDING (TCL)\n", maxname, "TYPE"); - for (tl = tl_kind ? tl_kind : bind_table_list; tl; tl = tl_kind ? 0 : tl->next) { if (tl->flags & HT_DELETED) @@ -1316,22 +1322,28 @@ void tell_binds(int idx, char *par) continue; proc = tc->func_name; build_flags(flg, &(tc->flags), NULL); - if (showall || proc[0] != '*') { - int ok = 0; - - if (patmatc == 1) { + ok = 0; + if (showall) { + ok = 1; + } else if (patmatc || showpy || showtcl) { + if ((patmatc == 1) && (proc[0] != '*')) { if (wild_match_per(name, tl->name) || wild_match_per(name, tm->mask) || - wild_match_per(name, tc->func_name)) + wild_match_per(name, tc->func_name)) { ok = 1; - } else + } + } else if (showpy && !(strncasecmp(tc->func_name, "*python:", strlen("*python:")))) { + ok = 1; + } else if (showtcl && (strncasecmp(tc->func_name, "*", strlen("*")))) { ok = 1; - - if (ok) { - dprintf(idx, " %*s %-8s %-20s %4d %s\n", maxname, tl->name, flg, - tm->mask, tc->hits, tc->func_name); - fnd = 1; } + } else if (proc[0] != '*') { + ok = 1; + } + if (ok) { + dprintf(idx, " %*s %-8s %-20s %4d %s\n", maxname, tl->name, flg, + tm->mask, tc->hits, tc->func_name); + fnd = 1; } } } From 75408b2634e88cfa41c0a35896b4aa9df22aa56a Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 28 Nov 2023 23:29:16 -0500 Subject: [PATCH 50/71] Create example scripts --- .../python.mod/exampleScripts/bestfriend.py | 31 +++++++++++++++++++ src/mod/python.mod/exampleScripts/greet.py | 23 ++++++++++++++ src/mod/python.mod/exampleScripts/imdb.py | 26 ++++++++++++++++ src/mod/python.mod/exampleScripts/listtls.py | 31 +++++++++++++++++++ src/mod/python.mod/exampleScripts/urlTitle.py | 27 ++++++++++++++++ 5 files changed, 138 insertions(+) create mode 100644 src/mod/python.mod/exampleScripts/bestfriend.py create mode 100644 src/mod/python.mod/exampleScripts/greet.py create mode 100644 src/mod/python.mod/exampleScripts/imdb.py create mode 100644 src/mod/python.mod/exampleScripts/listtls.py create mode 100644 src/mod/python.mod/exampleScripts/urlTitle.py diff --git a/src/mod/python.mod/exampleScripts/bestfriend.py b/src/mod/python.mod/exampleScripts/bestfriend.py new file mode 100644 index 000000000..27f4bdf3b --- /dev/null +++ b/src/mod/python.mod/exampleScripts/bestfriend.py @@ -0,0 +1,31 @@ +# GOAL: Demonstrate how to convert a list provided by a Tcl command into a Python list + +# Load bind from eggdrop, not eggdrop.tcl. Loading it from eggdrop.tcl would cause +# the bind to call a Tcl proc, not the python method. +from eggdrop import bind + +# Load any Tcl commands you want to use from the eggdrop.tcl module. +# Note we also import the non-standard 'parse_tcl_list' +from eggdrop.tcl import putmsg, putlog, chanlist, parse_tcl_list + +# And now, a totally normal python module +import random + +# This is a proc that calls the putmsg Tcl command. Note that, slightly different than Tcl, +# each argument is separated by a comma instead of just a space +# +# This function is trivial and silly, but shows how Python can properly accept and type a Tcl list +def pickAFriend(nick, user, hand, chan, text, **kwargs): + users = chanlist(chan) + # Here we use a new python function called 'parse_tcl_list' to convert the Tcl list provided by chanlist + # into a python list. Without this, you just have a long space-separated string + userlist = parse_tcl_list(users) + putlog(f"This is a python list of the users: {userlist}") + bestFriend = random.choice(userslist) + putmsg(chan, f"The first user I found was {userlist[0]}") + putmsg(chan, f"But {bestFriend} is my new best friend!") + +# Call binds at the end of the script, not the top- the methods must be defined! +bind("pub", "*", "!friend", pickAFriend) + +print('Loaded bestfriend.py') diff --git a/src/mod/python.mod/exampleScripts/greet.py b/src/mod/python.mod/exampleScripts/greet.py new file mode 100644 index 000000000..9400f8d30 --- /dev/null +++ b/src/mod/python.mod/exampleScripts/greet.py @@ -0,0 +1,23 @@ +# GOAL: Demonstrate how to use a Python bind to call a Python function + +# Load bind from eggdrop, not eggdrop.tcl. Loading it from eggdrop.tcl would cause +# the bind to call a Tcl proc, not the python function. +from eggdrop import bind + +# Load any Tcl commands you want to use from the eggdrop.tcl module. +from eggdrop.tcl import putmsg + +# This is a proc that calls the putmsg Tcl command. Note that, slightly different than Tcl, +# each argument is separated by a comma instead of just a space +def joinGreetUser(nick, host, handle, channel, **kwargs): + putmsg(channel, f"Hello {nick}, welcome to {channel}") + +def joinGreetOp(nick, host, handle, channel, **kwargs): + putmsg(channel, f"{nick} is an operator on this channel!") + +# Call binds at the end of the script, not the top- the functions must be defined! +bind("join", "*", "*", joinGreetUser) +# Again, arguments are separated with a comma. This bind requires the 'o' flag to be triggered. +bind("join", "o", "*", joinGreetOp) + +print('Loaded greet.py') diff --git a/src/mod/python.mod/exampleScripts/imdb.py b/src/mod/python.mod/exampleScripts/imdb.py new file mode 100644 index 000000000..d052377c3 --- /dev/null +++ b/src/mod/python.mod/exampleScripts/imdb.py @@ -0,0 +1,26 @@ +# GOAL: Demonstrate how to use a third-party python module + +# Load bind from eggdrop, not eggdrop.tcl. Loading it from eggdrop.tcl would cause +# the bind to call a Tcl proc, not the python function. +from eggdrop import bind + +# Load any Tcl commands you want to use. +from eggdrop.tcl import putmsg, putlog + +# Load a python module as usual. +from imdb import Cinemagoer + +# Just a totally normal Python function, nothing special here! Note the Tcl command +# 'putlog' is called +def pubGetMovie(nick, user, hand, chan, text, **kwargs): + imdb = Cinemagoer() + putlog("IMDB: Searching for "+text) + results = imdb.search_movie(text) + movie = imdb.get_movie(results[0].movieID) + putmsg(chan, f"Movie: {movie['title']} ({movie['year']}): {movie['plot outline']}") + +# Call binds at the end of the script, not the top- the functions must be defined! +bind("pub", "*", "!movie", pubGetMovie) + +# Should we talk about print vs putlog? +print('Loaded imdb.py') diff --git a/src/mod/python.mod/exampleScripts/listtls.py b/src/mod/python.mod/exampleScripts/listtls.py new file mode 100644 index 000000000..bfccddf6b --- /dev/null +++ b/src/mod/python.mod/exampleScripts/listtls.py @@ -0,0 +1,31 @@ +# GOAL: Demonstrate how to convert Tcl dicts nested in a Tcl list to a Python list of Python dicts + +# Load bind from eggdrop, not eggdrop.tcl. Loading it from eggdrop.tcl would cause +# the bind to call a Tcl proc, not the python method. +from eggdrop import bind + +# Load any Tcl commands you want to use from the eggdrop.tcl module. +# Note we also import the non-standard 'parse_tcl_list' +from eggdrop.tcl import putmsg, putlog, socklist, parse_tcl_list, parse_tcl_dict + +# This is a proc that calls the putmsg Tcl command. Note that, slightly different than Tcl, +# each argument is separated by a comma instead of just a space +# +# This function is trivial and silly, but shows how Python can properly accept and type a Tcl dict +def listInsecureSockets(nick, user, hand, chan, text, **kwargs): + sockets = socklist() + # socklist() will return us a Tcl-formatted list of dicts (aka, a string), so we have to first + # convert this to a Python list using parse_tcl_list(). + socketlist = parse_tcl_list(sockets) + # Now socklist contains a Python list of Tcl-formatted dicts (again, strings), so now we have + # to format each list item into a Python dict + for socket in socketlist: + socketdict = parse_tcl_dict(socket) + i = socketdict.get("idx") + status = socketdict.get("secure") + putmsg(chan, f"The TLS status of idx {i} is {status}") + +# Call binds at the end of the script, not the top- the methods must be defined! +bind("pub", "*", "!listtls", listInsecureSockets) + +print('Loaded listtls.py') diff --git a/src/mod/python.mod/exampleScripts/urlTitle.py b/src/mod/python.mod/exampleScripts/urlTitle.py new file mode 100644 index 000000000..60dc6ae00 --- /dev/null +++ b/src/mod/python.mod/exampleScripts/urlTitle.py @@ -0,0 +1,27 @@ +# GOAL: Demonstrate how to use a third party python module + +# Load bind from eggdrop, not eggdrop.tcl. Loading it from eggdrop.tcl would cause +# the bind to call a Tcl proc, not the python function. +from eggdrop import bind + +# Load any Tcl commands you want to use from the eggdrop.tcl module. +from eggdrop.tcl import putmsg, putlog + +# Load a python module as usual. +from bs4 import BeautifulSoup +import requests + +# Just a totally normal Python function, nothing special here! Note the Tcl command +# 'putlog' is called +def pubGetTitle(nick, host, handle, channel, text, **kwargs): + try: + reqs = requests.get(text) + soup = BeautifulSoup(reqs.text, 'html.parser') + putmsg(channel, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) + except Exception as e: + putmsg(channel, "Error: " + str(e)) + +# Call binds at the end of the script, not the top- the functions must be defined! +bind("pub", "*", "!title", pubGetTitle) + +print('Loaded example.py') From 2898516a8fb7b92f0026f2f8ced99d11321fb031 Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 28 Nov 2023 23:36:25 -0500 Subject: [PATCH 51/71] Add parse_tcl_list/dict to docs --- doc/sphinx_source/modules/mod/python.rst | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/doc/sphinx_source/modules/mod/python.rst b/doc/sphinx_source/modules/mod/python.rst index b7235b17d..30f145c0a 100644 --- a/doc/sphinx_source/modules/mod/python.rst +++ b/doc/sphinx_source/modules/mod/python.rst @@ -48,6 +48,23 @@ pysource The ``pysource`` command is analgous to the Tcl ``source`` command, except that it loads a Python script into Eggdrop instead of a Tcl script. +--------------- +Python Commands +--------------- + +^^^^^^^^^^^^^^^^^^^^^^^ +parse_tcl_list +^^^^^^^^^^^^^^^^^^^^^^^ + +When a python script calls a Tcl command that returns a list via the eggdrop.tcl module, the return value will be a Tcl-formatted list- also simply known as a string. The ``parse_tcl_list`` command will convert the Tcl-formatted list into a Python list, which can then freely be used within the Python script. + +^^^^^^^^^^^^^^^^^^^^^^^ +parse_tcl_dict +^^^^^^^^^^^^^^^^^^^^^^^ + +When a python script calls a Tcl command that returns a dict via the eggdrop.tcl module, the return value will be a Tcl-formatted dict- also simply known as a string. The ``parse_tcl_dict`` command will c +onvert the Tcl-formatted dict into a Python list, which can then freely be used within the Python script. + ---------------- Config variables ---------------- @@ -93,6 +110,4 @@ Writing a module for use with Eggdrop This is how you import a module for use with an egg python script. - - Copyright (C) 2000 - 2023 Eggheads Development Team From ce826380746a2f1ffa21d7e4ac4792ed73fcf2b8 Mon Sep 17 00:00:00 2001 From: Geo Date: Wed, 29 Nov 2023 19:42:21 -0500 Subject: [PATCH 52/71] Move parse_tcl_list/dict to base eggdrop module, update docs --- doc/sphinx_source/modules/mod/python.rst | 39 ++++++++++++++----- doc/sphinx_source/using/tcl-commands.rst | 2 + .../python.mod/exampleScripts/bestfriend.py | 7 ++-- src/mod/python.mod/exampleScripts/listtls.py | 7 ++-- src/mod/python.mod/pycmds.c | 4 +- 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/doc/sphinx_source/modules/mod/python.rst b/doc/sphinx_source/modules/mod/python.rst index 30f145c0a..86c26ec68 100644 --- a/doc/sphinx_source/modules/mod/python.rst +++ b/doc/sphinx_source/modules/mod/python.rst @@ -48,9 +48,19 @@ pysource The ``pysource`` command is analgous to the Tcl ``source`` command, except that it loads a Python script into Eggdrop instead of a Tcl script. ---------------- -Python Commands ---------------- +----------------------- +Eggdrop Python Commands +----------------------- + +The Python module is built to use the existing core Tcl commands integrated into Eggdrop via the ``eggdrop.tcl`` module. To call an existing Tcl command from Python, you can either load the entire catalog by running ``import eggdrop.tcl``, or be more specific by ``from eggdrop.tcl import putserv, putlog, chanlist``, etc. + +Additionally, a few extra python commands have been created for use: + +^^^^^^^^^^^^^^^^ +bind +^^^^^^^^^^^^^^^^ + +The python version of the bind command is used to create a bind that triggers a python function. The python bind takes the same arguments as the Tcl binds, for more information on bind argument syntax please see tcl_binds_. The eggdrop.tcl.bind command should not be used as it will attempt to call a Tcl proc. ^^^^^^^^^^^^^^^^^^^^^^^ parse_tcl_list @@ -77,17 +87,26 @@ There are also some variables you can set in your config file: the disconnect. When they reconnect, they will not have to transfer the complete user file, but, instead, just send the resync buffer. ------------------------ -Eggdrop Python Commands ------------------------ - - The Python module is built to use the existing core Tcl commands integrated into Eggdrop via the ``eggdrop`` module. To use - -------------------------------- Writing an Eggdrop Python script -------------------------------- - This is how to write a python script for Eggdrop. +This is how to write a python script for Eggdrop. + +You can view examples of Python scripts in the exampleScripts folder included with this module. + +.. glossary:: + bestfriend.py + This example script demonstrates how to use the parse_tcl_list() python command to convert a list returned by a Tcl command into a list that is usable by Python. + greet.py + This is a very basic script that demonstrates how a Python script with binds can be run by Eggdrop. + imdb.py + This script shows how to use an existing third-party module to extend a Python script, in this case retrieving information from imdb.com. + listtls.py + This script demonstrates how to use parse-tcl_list() and parse_tcl_dict() to convert a list of dicts provided by Tcl into something that is usuable by Python. + urltitle.py + This script shows how to use an existing third-party module to extend a Python script, in this case using an http parser to collect title information from a provided web page. + ^^^^^^^^^^^^^^ Header section diff --git a/doc/sphinx_source/using/tcl-commands.rst b/doc/sphinx_source/using/tcl-commands.rst index cff20f667..ce8f10fb4 100644 --- a/doc/sphinx_source/using/tcl-commands.rst +++ b/doc/sphinx_source/using/tcl-commands.rst @@ -2925,6 +2925,8 @@ modify args. To remove a bind, use the 'unbind' command. For example, to remove the bind for the "stop" msg command, use 'unbind msg - stop msg:stop'. +.. _tcl_binds: + ^^^^^^^^^^ Bind Types ^^^^^^^^^^ diff --git a/src/mod/python.mod/exampleScripts/bestfriend.py b/src/mod/python.mod/exampleScripts/bestfriend.py index 27f4bdf3b..2e61b7718 100644 --- a/src/mod/python.mod/exampleScripts/bestfriend.py +++ b/src/mod/python.mod/exampleScripts/bestfriend.py @@ -2,11 +2,10 @@ # Load bind from eggdrop, not eggdrop.tcl. Loading it from eggdrop.tcl would cause # the bind to call a Tcl proc, not the python method. -from eggdrop import bind +from eggdrop import bind, parse_tcl_list # Load any Tcl commands you want to use from the eggdrop.tcl module. -# Note we also import the non-standard 'parse_tcl_list' -from eggdrop.tcl import putmsg, putlog, chanlist, parse_tcl_list +from eggdrop.tcl import putmsg, putlog, chanlist # And now, a totally normal python module import random @@ -21,7 +20,7 @@ def pickAFriend(nick, user, hand, chan, text, **kwargs): # into a python list. Without this, you just have a long space-separated string userlist = parse_tcl_list(users) putlog(f"This is a python list of the users: {userlist}") - bestFriend = random.choice(userslist) + bestFriend = random.choice(userlist) putmsg(chan, f"The first user I found was {userlist[0]}") putmsg(chan, f"But {bestFriend} is my new best friend!") diff --git a/src/mod/python.mod/exampleScripts/listtls.py b/src/mod/python.mod/exampleScripts/listtls.py index bfccddf6b..1f802e904 100644 --- a/src/mod/python.mod/exampleScripts/listtls.py +++ b/src/mod/python.mod/exampleScripts/listtls.py @@ -2,11 +2,10 @@ # Load bind from eggdrop, not eggdrop.tcl. Loading it from eggdrop.tcl would cause # the bind to call a Tcl proc, not the python method. -from eggdrop import bind +from eggdrop import bind, parse_tcl_list, parse_tcl_dict # Load any Tcl commands you want to use from the eggdrop.tcl module. -# Note we also import the non-standard 'parse_tcl_list' -from eggdrop.tcl import putmsg, putlog, socklist, parse_tcl_list, parse_tcl_dict +from eggdrop.tcl import putmsg, putlog, socklist # This is a proc that calls the putmsg Tcl command. Note that, slightly different than Tcl, # each argument is separated by a comma instead of just a space @@ -18,7 +17,7 @@ def listInsecureSockets(nick, user, hand, chan, text, **kwargs): # convert this to a Python list using parse_tcl_list(). socketlist = parse_tcl_list(sockets) # Now socklist contains a Python list of Tcl-formatted dicts (again, strings), so now we have - # to format each list item into a Python dict + # to format each list item into a Python dict using parse_tcl_dict(). for socket in socketlist: socketdict = parse_tcl_dict(socket) i = socketdict.get("idx") diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 53408824c..182e0dbca 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -302,14 +302,14 @@ static PyMethodDef MyPyMethods[] = { {"ircsend", py_ircsend, METH_VARARGS, "Send message to server"}, {"bind", py_bind, METH_VARARGS, "register an eggdrop python bind"}, {"findircuser", py_findircuser, METH_VARARGS, "find an IRC user by nickname and optional channel"}, + {"parse_tcl_list", py_parse_tcl_list, METH_VARARGS, "convert a Tcl list string to a Python list"}, + {"parse_tcl_dict", py_parse_tcl_dict, METH_VARARGS, "convert a Tcl dict string to a Python dict"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; static PyMethodDef EggTclMethods[] = { // TODO: __dict__ with all valid Tcl commands? {"__getattr__", py_findtclfunc, METH_VARARGS, "fallback to call Tcl functions transparently"}, - {"parse_tcl_list", py_parse_tcl_list, METH_VARARGS, "convert a Tcl list string to a Python list"}, - {"parse_tcl_dict", py_parse_tcl_dict, METH_VARARGS, "convert a Tcl dict string to a Python dict"}, {NULL, NULL, 0, NULL} }; From 83c29e7b6c14bcd2444a58b3c919170e1c83be77 Mon Sep 17 00:00:00 2001 From: Geo Date: Fri, 1 Dec 2023 14:23:56 -0500 Subject: [PATCH 53/71] rename example dir, rm old example.py --- src/mod/python.mod/example.py | 52 ------------------- .../bestfriend.py | 0 .../{exampleScripts => examples}/greet.py | 0 .../{exampleScripts => examples}/imdb.py | 0 .../{exampleScripts => examples}/listtls.py | 0 .../{exampleScripts => examples}/urlTitle.py | 0 6 files changed, 52 deletions(-) delete mode 100644 src/mod/python.mod/example.py rename src/mod/python.mod/{exampleScripts => examples}/bestfriend.py (100%) rename src/mod/python.mod/{exampleScripts => examples}/greet.py (100%) rename src/mod/python.mod/{exampleScripts => examples}/imdb.py (100%) rename src/mod/python.mod/{exampleScripts => examples}/listtls.py (100%) rename src/mod/python.mod/{exampleScripts => examples}/urlTitle.py (100%) diff --git a/src/mod/python.mod/example.py b/src/mod/python.mod/example.py deleted file mode 100644 index 1bb64fb9d..000000000 --- a/src/mod/python.mod/example.py +++ /dev/null @@ -1,52 +0,0 @@ -import requests -from eggdrop import bind, findircuser -from eggdrop.tcl import putmsg -from bs4 import BeautifulSoup -from pprint import pprint -from imdb import Cinemagoer - -def pubGetTitle(nick, host, handle, channel, text, **kwargs): - try: - reqs = requests.get(text) - soup = BeautifulSoup(reqs.text, 'html.parser') - putmsg(channel, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) - except Exception as e: - putmsg(channel, "Error: " + str(e)) - -# Called from pub or msg, responds public or privately -def mypub(nick, host, handle, channel, text, **kwargs): - putmsg(channel, f"{nick}, you said !moo") - -def joinGreetUser(nick, host, handle, channel, **kwargs): - putmsg(channel, f"Hello {nick}, welcome to {channel}") - -def joinGreetOp(nick, host, handle, channel, **kwargs): - putmsg(channel, f"Hello {nick}, welcome to {channel}, you are an operator") - -badwords = ['thommey', 'eggdrop', 'python'] -def checkWords(nick, host, handle, channel, text, **kwargs): - for word in badwords: - if word in text: - putmsg(channel, f"I'm banning you, {nick}, for saying {word}") - break - -def pubGetMovie(nick, user, hand, chan, text, **kwargs): - imdb = Cinemagoer() - putlog(text) - results = imdb.search_movie(text) - movie = imdb.get_movie(results[0].movieID) -# result = imdb.get_movie('0133093') -# putlog(result) -# putmsg(chan, f"-= {result[0]['title']} ({result[0]['year']}). {result[0]['rating']}. {result[0]['plot outline']}") -# putlog(f"plot: {results[0]['plot outline'] -# putlog(f"Movie is {results[0]['title']}") - putmsg(chan, f"Movie: {movie['title']} ({movie['year']}): {movie['plot outline']}") - -bind("pub", "*", "!moo", mypub) -bind("join", "*", "*", joinGreetUser) -bind("join", "*", "*", joinGreetOp) -bind("pubm", "*", "*", checkWords) -bind("pub", "*", "!title", pubGetTitle) -bind("pub", "*", "!movie", pubGetMovie) - -print('Loaded example.py') diff --git a/src/mod/python.mod/exampleScripts/bestfriend.py b/src/mod/python.mod/examples/bestfriend.py similarity index 100% rename from src/mod/python.mod/exampleScripts/bestfriend.py rename to src/mod/python.mod/examples/bestfriend.py diff --git a/src/mod/python.mod/exampleScripts/greet.py b/src/mod/python.mod/examples/greet.py similarity index 100% rename from src/mod/python.mod/exampleScripts/greet.py rename to src/mod/python.mod/examples/greet.py diff --git a/src/mod/python.mod/exampleScripts/imdb.py b/src/mod/python.mod/examples/imdb.py similarity index 100% rename from src/mod/python.mod/exampleScripts/imdb.py rename to src/mod/python.mod/examples/imdb.py diff --git a/src/mod/python.mod/exampleScripts/listtls.py b/src/mod/python.mod/examples/listtls.py similarity index 100% rename from src/mod/python.mod/exampleScripts/listtls.py rename to src/mod/python.mod/examples/listtls.py diff --git a/src/mod/python.mod/exampleScripts/urlTitle.py b/src/mod/python.mod/examples/urlTitle.py similarity index 100% rename from src/mod/python.mod/exampleScripts/urlTitle.py rename to src/mod/python.mod/examples/urlTitle.py From d3b019f04cd4ddc0ceb997ec4b8cf2e042f4564b Mon Sep 17 00:00:00 2001 From: Geo Date: Fri, 1 Dec 2023 17:09:21 -0500 Subject: [PATCH 54/71] Fix bad deconflict merge --- src/mod/pbkdf2.mod/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mod/pbkdf2.mod/Makefile b/src/mod/pbkdf2.mod/Makefile index db88ca9a7..6cf40c584 100644 --- a/src/mod/pbkdf2.mod/Makefile +++ b/src/mod/pbkdf2.mod/Makefile @@ -35,6 +35,5 @@ distclean: clean ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \ ../../../src/compat/compat.h ../../../src/compat/base64.h \ ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \ - ../../../src/compat/gethostbyname2.h \ ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \ ../../../src/mod/modvals.h ../../../src/tandem.h From ad1b30e53085a937c2c98ec947a55a89eba5ac7c Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 5 Dec 2023 15:54:01 -0500 Subject: [PATCH 55/71] adjust .python interpreter --- src/mod/python.mod/pycmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 182e0dbca..c4347d59a 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -42,7 +42,7 @@ static void cmd_python(struct userrec *u, int idx, char *par) { PyErr_Clear(); - pobj = PyRun_String(par, Py_eval_input, pglobals, pglobals); + pobj = PyRun_String(par, Py_single_input, pglobals, pglobals); if (pobj) { pstr = PyObject_Str(pobj); From d38f092ce0faade38cad62c9608e35016bab4024 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 10 Dec 2023 19:44:52 +0100 Subject: [PATCH 56/71] Python: Expressions results to last .python idx --- src/mod/python.mod/pycmds.c | 24 +++++++++++++++++++----- src/mod/python.mod/python.c | 2 ++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index c4347d59a..4db6a2d6e 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -17,6 +17,7 @@ typedef struct { } TclFunc; static PyTypeObject TclFuncType; +static int eval_idx = -1; static struct py_bind *py_bindlist; @@ -37,17 +38,29 @@ static PyObject *py_ircsend(PyObject *self, PyObject *args) { Py_RETURN_NONE; } +static void py_displayhook(PyObject *self, PyObject *o) { + PyObject *pstr; + + if (o) { + pstr = PyObject_Repr(o); + if (pstr) { + dprintf(eval_idx, "Python: %s\n", PyUnicode_AsUTF8(pstr)); + Py_DECREF(pstr); + } + } +} + static void cmd_python(struct userrec *u, int idx, char *par) { - PyObject *pobj, *pstr; + PyObject *pobj; PyErr_Clear(); + // Expression output redirection via sys.displayhook + eval_idx = idx; pobj = PyRun_String(par, Py_single_input, pglobals, pglobals); - if (pobj) { - pstr = PyObject_Str(pobj); - dprintf(idx, "%s\n", PyUnicode_AsUTF8(pstr)); - Py_DECREF(pstr); + if (pobj) { + // always None Py_DECREF(pobj); } else if (PyErr_Occurred()) { PyErr_Print(); @@ -304,6 +317,7 @@ static PyMethodDef MyPyMethods[] = { {"findircuser", py_findircuser, METH_VARARGS, "find an IRC user by nickname and optional channel"}, {"parse_tcl_list", py_parse_tcl_list, METH_VARARGS, "convert a Tcl list string to a Python list"}, {"parse_tcl_dict", py_parse_tcl_dict, METH_VARARGS, "convert a Tcl dict string to a Python dict"}, + {"__displayhook__", py_displayhook, METH_O, "display hook for python expressions"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index ecdd428b2..e68197734 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -90,6 +90,8 @@ static void init_python() { PyRun_SimpleString("import sys"); PyRun_SimpleString("sys.path.append(\".\")"); + PyRun_SimpleString("import eggdrop"); + PyRun_SimpleString("sys.displayhook = eggdrop.__displayhook__"); return; } From 00327a478b9b9fb9c4e7bc206268d6342875fd67 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 10 Dec 2023 20:09:42 +0100 Subject: [PATCH 57/71] Tcl API improvements from Python --- src/mod/python.mod/pycmds.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 4db6a2d6e..9a82db64a 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -252,7 +252,16 @@ static Tcl_Obj *py_dict_to_tcl_obj(PyObject *o) { } static Tcl_Obj *py_str_to_tcl_obj(PyObject *o) { - return Tcl_NewStringObj(PyUnicode_AsUTF8(o), -1); + Tcl_Obj *ret; + PyObject *strobj = PyObject_Str(o); + + if (strobj) { + ret = Tcl_NewStringObj(PyUnicode_AsUTF8(strobj), -1); + Py_DECREF(strobj); + } else { + ret = Tcl_NewStringObj("", -1); + } + return ret; } static Tcl_Obj *py_to_tcl_obj(PyObject *o) { @@ -287,7 +296,12 @@ static PyObject *python_call_tcl(PyObject *self, PyObject *args, PyObject *kwarg return NULL; } result = Tcl_GetStringResult(tclinterp); - putlog(LOG_MISC, "*", "Python called '%s' -> '%s'", Tcl_DStringValue(&ds), result); + //putlog(LOG_MISC, "*", "Python called '%s' -> '%s'", Tcl_DStringValue(&ds), result); + + if (!*result) { + // Empty string means okay + Py_RETURN_NONE; + } return PyUnicode_DecodeUTF8(result, strlen(result), NULL); } From c5210db1af8ea6d74e94a2a3242226ba726049f3 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 10 Dec 2023 20:20:40 +0100 Subject: [PATCH 58/71] Fix None handling --- src/mod/python.mod/pycmds.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 9a82db64a..d896434f9 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -259,7 +259,7 @@ static Tcl_Obj *py_str_to_tcl_obj(PyObject *o) { ret = Tcl_NewStringObj(PyUnicode_AsUTF8(strobj), -1); Py_DECREF(strobj); } else { - ret = Tcl_NewStringObj("", -1); + ret = Tcl_NewObj(); } return ret; } @@ -271,6 +271,8 @@ static Tcl_Obj *py_to_tcl_obj(PyObject *o) { return py_dict_to_tcl_obj(o); } else if (PyTuple_Check(o)) { return py_tuple_to_tcl_obj(o); + } else if (o == Py_None) { + return Tcl_NewObj(); } else { return py_str_to_tcl_obj(o); } From 1dcb14743ac4dfe50f464644a2178e7e37b7a05c Mon Sep 17 00:00:00 2001 From: Geo Date: Sun, 10 Dec 2023 16:17:57 -0500 Subject: [PATCH 59/71] Fix bad Makefile.in merge --- src/mod/python.mod/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mod/python.mod/Makefile.in b/src/mod/python.mod/Makefile.in index 46d4376ad..6b6c4ad5d 100644 --- a/src/mod/python.mod/Makefile.in +++ b/src/mod/python.mod/Makefile.in @@ -38,7 +38,6 @@ distclean: clean ../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \ ../../../src/compat/compat.h ../../../src/compat/base64.h \ ../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \ - ../../../src/compat/gethostbyname2.h \ ../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \ ../../../src/mod/modvals.h ../../../src/tandem.h \ ../../../src/mod/irc.mod/irc.h ../../../src/mod/server.mod/server.h \ From 2fc428bb7f4aff994cd9f3cd6903d1901af4de06 Mon Sep 17 00:00:00 2001 From: Geo Date: Sun, 10 Dec 2023 19:02:45 -0500 Subject: [PATCH 60/71] remove unused variable --- src/mod/python.mod/pycmds.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index d896434f9..4e67588e0 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -309,7 +309,6 @@ static PyObject *python_call_tcl(PyObject *self, PyObject *args, PyObject *kwarg } static PyObject *py_findtclfunc(PyObject *self, PyObject *args) { - Tcl_Command tclcmd; char *cmdname; TclFunc *result; @@ -318,7 +317,7 @@ static PyObject *py_findtclfunc(PyObject *self, PyObject *args) { return NULL; } // TODO: filter a bit better what is available to Python, specify return types ("list of string"), etc. - if (!(tclcmd = Tcl_FindCommand(tclinterp, cmdname, NULL, TCL_GLOBAL_ONLY))) { + if (!(Tcl_FindCommand(tclinterp, cmdname, NULL, TCL_GLOBAL_ONLY))) { PyErr_SetString(PyExc_AttributeError, cmdname); return NULL; } From 9477c41e1392f09723171894b99b481607e884b2 Mon Sep 17 00:00:00 2001 From: Geo Date: Sun, 10 Dec 2023 19:11:49 -0500 Subject: [PATCH 61/71] convert displayhook to PyObj --- src/mod/python.mod/pycmds.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 4e67588e0..0d16568a8 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -38,7 +38,7 @@ static PyObject *py_ircsend(PyObject *self, PyObject *args) { Py_RETURN_NONE; } -static void py_displayhook(PyObject *self, PyObject *o) { +static PyObject *py_displayhook(PyObject *self, PyObject *o) { PyObject *pstr; if (o) { @@ -48,6 +48,7 @@ static void py_displayhook(PyObject *self, PyObject *o) { Py_DECREF(pstr); } } + Py_RETURN_NONE; } static void cmd_python(struct userrec *u, int idx, char *par) { From 1c22fe3f5f56c3ee19984f2741cbb51ff0b55b88 Mon Sep 17 00:00:00 2001 From: Geo Date: Sun, 10 Dec 2023 23:29:10 -0500 Subject: [PATCH 62/71] Add traceback reporting --- src/mod/python.mod/pycmds.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 0d16568a8..8626785df 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -52,7 +52,10 @@ static PyObject *py_displayhook(PyObject *self, PyObject *o) { } static void cmd_python(struct userrec *u, int idx, char *par) { - PyObject *pobj; + PyObject *pobj, *ptype, *pvalue, *ptraceback; + PyObject *pystr, *module_name, *pymodule, *pyfunc, *pyval, *item; + Py_ssize_t n; + int i; PyErr_Clear(); @@ -64,7 +67,31 @@ static void cmd_python(struct userrec *u, int idx, char *par) { // always None Py_DECREF(pobj); } else if (PyErr_Occurred()) { - PyErr_Print(); + PyErr_Fetch(&ptype, &pvalue, &ptraceback); + pystr = PyObject_Str(pvalue); + // Get "pretty" error result + dprintf(eval_idx, "Python Error: %s\n", PyUnicode_AsUTF8(pystr)); + module_name = PyUnicode_FromString("traceback"); + pymodule = PyImport_Import(module_name); + Py_DECREF(module_name); + // format backtrace and print + pyfunc = PyObject_GetAttrString(pymodule, "format_exception"); + if (pyfunc && PyCallable_Check(pyfunc)) { + pyval = PyObject_CallFunctionObjArgs(pyfunc, ptype, pvalue, ptraceback, NULL); + // Check if traceback is a list and handle as such + if (PyList_Check(pyval)) { + n = PyList_Size(pyval); + for (i = 0; i < n; i++) { + item = PyList_GetItem(pyval, i); + pystr = PyObject_Str(item); + dprintf(idx, "%s", PyUnicode_AsUTF8(pystr)); + } + } else { + pystr = PyObject_Str(pyval); + dprintf(idx, "%s", PyUnicode_AsUTF8(pystr)); + } + Py_DECREF(pyval); + } } return; } From c5499d2ca5a9dfec12926a56273441c65d6aadda Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 12 Dec 2023 16:34:51 -0500 Subject: [PATCH 63/71] Add backtrace for pysource --- src/mod/python.mod/tclpython.c | 36 ++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/mod/python.mod/tclpython.c b/src/mod/python.mod/tclpython.c index c198a460f..7abdeb998 100644 --- a/src/mod/python.mod/tclpython.c +++ b/src/mod/python.mod/tclpython.c @@ -26,7 +26,11 @@ static int tcl_pysource STDVAR BADARGS(2, 2, " script"); FILE *fp; - PyObject *pobj, *pstr; + PyObject *pobj, *pstr, *ptype, *pvalue, *ptraceback; + PyObject *pystr, *module_name, *pymodule, *pyfunc, *pyval, *item; + Py_ssize_t n; + char *res = NULL; + int i; if (!(fp = fopen(argv[1], "r"))) { Tcl_AppendResult(irp, "Error: could not open file ", argv[1],": ", strerror(errno), NULL); @@ -40,7 +44,35 @@ static int tcl_pysource STDVAR Py_DECREF(pstr); Py_DECREF(pobj); } else if (PyErr_Occurred()) { - PyErr_Print(); + PyErr_Fetch(&ptype, &pvalue, &ptraceback); + pystr = PyObject_Str(pvalue); + Tcl_AppendResult(irp, "Error loading python: ", PyUnicode_AsUTF8(pystr), NULL); + module_name = PyUnicode_FromString("traceback"); + pymodule = PyImport_Import(module_name); + Py_DECREF(module_name); + // format backtrace and print + pyfunc = PyObject_GetAttrString(pymodule, "format_exception"); + if (pyfunc && PyCallable_Check(pyfunc)) { + pyval = PyObject_CallFunctionObjArgs(pyfunc, ptype, pvalue, ptraceback, NULL); + // Check if traceback is a list and handle as such + if (PyList_Check(pyval)) { + n = PyList_Size(pyval); + for (i = 0; i < n; i++) { + item = PyList_GetItem(pyval, i); + pystr = PyObject_Str(item); + res = PyUnicode_AsUTF8(pystr); + if (res[strlen(res) - 1]) { + res[strlen(res) - 1] = '\0'; + } + putlog(LOG_MISC, "*", "%s", res); + } + } else { + pystr = PyObject_Str(pyval); + Tcl_AppendResult(irp, PyUnicode_AsUTF8(pystr), NULL); + } + Py_DECREF(pyval); + } + return TCL_ERROR; } return TCL_OK; } From a8f2c9cb0627c5fcb65f7a6c94e9d698e84bad92 Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 19 Dec 2023 20:58:06 -0500 Subject: [PATCH 64/71] Update config API; check minimum python --- src/main.c | 2 ++ src/mod/module.h | 1 + src/mod/python.mod/pycmds.c | 20 +++++++++++--------- src/mod/python.mod/python.c | 29 ++++++++++++++++++++++++----- src/mod/python.mod/tclpython.c | 11 +++++++++-- src/modules.c | 5 ++++- 6 files changed, 51 insertions(+), 17 deletions(-) diff --git a/src/main.c b/src/main.c index 6ac8ec908..a859b794d 100644 --- a/src/main.c +++ b/src/main.c @@ -95,6 +95,7 @@ extern sigjmp_buf alarmret; time_t now; static int argc; static char **argv; +char *argv0; /* * Please use the PATCH macro instead of directly altering the version @@ -1034,6 +1035,7 @@ int main(int arg_c, char **arg_v) argc = arg_c; argv = arg_v; + argv0 = argv[0]; /* Version info! */ #ifdef EGG_PATCH diff --git a/src/mod/module.h b/src/mod/module.h index 9b674577b..a7108218f 100644 --- a/src/mod/module.h +++ b/src/mod/module.h @@ -531,6 +531,7 @@ typedef void (*chanout_butfunc)(int, int, const char *, ...) ATTRIBUTE_FORMAT(pr /* 320 - 323 */ #define bind_bind_entry ((int(*)(tcl_bind_list_t *, const char *, const char *, const char *))global[320]) #define unbind_bind_entry ((int(*)(tcl_bind_list_t *, const char *, const char *, const char *))global[321]) +#define argv0 ((char *)global[322]) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 8626785df..2855ed0a3 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -79,18 +79,20 @@ static void cmd_python(struct userrec *u, int idx, char *par) { if (pyfunc && PyCallable_Check(pyfunc)) { pyval = PyObject_CallFunctionObjArgs(pyfunc, ptype, pvalue, ptraceback, NULL); // Check if traceback is a list and handle as such - if (PyList_Check(pyval)) { - n = PyList_Size(pyval); - for (i = 0; i < n; i++) { - item = PyList_GetItem(pyval, i); - pystr = PyObject_Str(item); + if (pyval) { + if (pyval && PyList_Check(pyval)) { + n = PyList_Size(pyval); + for (i = 0; i < n; i++) { + item = PyList_GetItem(pyval, i); + pystr = PyObject_Str(item); + dprintf(idx, "%s", PyUnicode_AsUTF8(pystr)); + } + } else { + pystr = PyObject_Str(pyval); dprintf(idx, "%s", PyUnicode_AsUTF8(pystr)); } - } else { - pystr = PyObject_Str(pyval); - dprintf(idx, "%s", PyUnicode_AsUTF8(pystr)); + Py_DECREF(pyval); } - Py_DECREF(pyval); } } return; diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index e68197734..b33e484dc 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -66,18 +66,37 @@ static int python_expmem() static void init_python() { PyObject *pmodule; - wchar_t *program = Py_DecodeLocale("eggdrop", NULL); + PyStatus status; + PyConfig config; + wchar_t *program; - if (program == NULL) { - fprintf(stderr, "Python: Fatal error: This should never happen\n"); + if (PY_VERSION_HEX < 0x0308) { + fprintf(stderr, "Python: Python version %d is lower than 3.8, not loading Python module", PY_VERSION_HEX); + return; + } + PyConfig_InitPythonConfig(&config); + program = Py_DecodeLocale(argv0, NULL); + if (!program) { + PyConfig_Clear(&config); + fprintf(stderr, "Python: Fatal error: This should never happen\n"); + fatal(1); + } + status = PyConfig_SetString(&config, &config.program_name, program); + if (PyStatus_Exception(status)) { + PyConfig_Clear(&config); + fprintf(stderr, "Python: Fatal error: Could not set program base path\n"); fatal(1); } - Py_SetProgramName(program); /* optional but recommended */ if (PyImport_AppendInittab("eggdrop", &PyInit_eggdrop) == -1) { fprintf(stderr, "Error: could not extend in-built modules table\n"); exit(1); } - Py_Initialize(); + status = Py_InitializeFromConfig(&config); + if (PyStatus_Exception(status)) { + PyConfig_Clear(&config); + fprintf(stderr, "Python: Fatal error: Could not initialize config\n"); + fatal(1); + } PyDateTime_IMPORT; pmodule = PyImport_ImportModule("eggdrop"); if (!pmodule) { diff --git a/src/mod/python.mod/tclpython.c b/src/mod/python.mod/tclpython.c index 7abdeb998..6218bfe3b 100644 --- a/src/mod/python.mod/tclpython.c +++ b/src/mod/python.mod/tclpython.c @@ -29,7 +29,8 @@ static int tcl_pysource STDVAR PyObject *pobj, *pstr, *ptype, *pvalue, *ptraceback; PyObject *pystr, *module_name, *pymodule, *pyfunc, *pyval, *item; Py_ssize_t n; - char *res = NULL; + const char *res = NULL; + char *res2; int i; if (!(fp = fopen(argv[1], "r"))) { @@ -60,11 +61,17 @@ static int tcl_pysource STDVAR for (i = 0; i < n; i++) { item = PyList_GetItem(pyval, i); pystr = PyObject_Str(item); + //Python returns a const char but we need to remove the \n res = PyUnicode_AsUTF8(pystr); if (res[strlen(res) - 1]) { - res[strlen(res) - 1] = '\0'; + res2 = (char*) nmalloc(strlen(res)+1); + strncpy(res2, res, strlen(res)); + res2[strlen(res) - 1] = '\0'; } putlog(LOG_MISC, "*", "%s", res); + if (res2) { + nfree(res2); + } } } else { pystr = PyObject_Str(pyval); diff --git a/src/modules.c b/src/modules.c index 5fe8b0543..754ac9f5d 100644 --- a/src/modules.c +++ b/src/modules.c @@ -98,6 +98,8 @@ extern time_t now, online_since; extern tand_t *tandbot; extern Tcl_Interp *interp; extern sock_list *socklist; +extern char argv0; + int xtra_kill(); int xtra_unpack(); @@ -629,7 +631,8 @@ Function global_table[] = { (Function) check_tcl_event_arg, /* 320 - 323 */ (Function) bind_bind_entry, - (Function) unbind_bind_entry + (Function) unbind_bind_entry, + (Function) & argv0 }; void init_modules(void) From 7b270e998c3d7ca02fe8354bbb91625b861a5d3d Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 19 Dec 2023 21:30:18 -0500 Subject: [PATCH 65/71] cleanup traceback reporting --- src/mod/python.mod/tclpython.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mod/python.mod/tclpython.c b/src/mod/python.mod/tclpython.c index 6218bfe3b..d7f6e484e 100644 --- a/src/mod/python.mod/tclpython.c +++ b/src/mod/python.mod/tclpython.c @@ -63,13 +63,13 @@ static int tcl_pysource STDVAR pystr = PyObject_Str(item); //Python returns a const char but we need to remove the \n res = PyUnicode_AsUTF8(pystr); - if (res[strlen(res) - 1]) { - res2 = (char*) nmalloc(strlen(res)+1); - strncpy(res2, res, strlen(res)); - res2[strlen(res) - 1] = '\0'; + if (strlen(res)) { + res2 = (char*) nmalloc(strlen(res)); + // Remove trailing \n + strlcpy(res2, res, strlen(res)-1); } - putlog(LOG_MISC, "*", "%s", res); - if (res2) { + putlog(LOG_MISC, "*", "%s", res2); + if (res2 != NULL) { nfree(res2); } } From e6e8db5cbd16ef72282d9694879d1b8eceb9b6ab Mon Sep 17 00:00:00 2001 From: Geo Date: Tue, 19 Dec 2023 21:33:01 -0500 Subject: [PATCH 66/71] initialize res2 --- src/mod/python.mod/tclpython.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/python.mod/tclpython.c b/src/mod/python.mod/tclpython.c index d7f6e484e..4aef45cc0 100644 --- a/src/mod/python.mod/tclpython.c +++ b/src/mod/python.mod/tclpython.c @@ -30,7 +30,7 @@ static int tcl_pysource STDVAR PyObject *pystr, *module_name, *pymodule, *pyfunc, *pyval, *item; Py_ssize_t n; const char *res = NULL; - char *res2; + char *res2 = NULL; int i; if (!(fp = fopen(argv[1], "r"))) { From af7362fe37bd485313e1a85c120961893dad6dc9 Mon Sep 17 00:00:00 2001 From: Geo Date: Mon, 1 Jan 2024 21:18:56 -0500 Subject: [PATCH 67/71] remove DecodeLocale --- src/mod/python.mod/python.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index b33e484dc..f5aa2b396 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -1,8 +1,5 @@ /* - * twitch.c -- part of twitch.mod - * will cease to work. Buyer beware. - * - * Originally written by Geo April 2020 + * python.c -- part of python.mod */ /* @@ -25,6 +22,7 @@ #define MODULE_NAME "python" #define MAKING_PYTHON +#define PY_SSIZE_T_CLEAN /* Not required for 3.13+ but here for back compat */ #define ARRAYCOUNT(x) (sizeof (x) / sizeof *(x)) @@ -68,24 +66,17 @@ static void init_python() { PyObject *pmodule; PyStatus status; PyConfig config; - wchar_t *program; if (PY_VERSION_HEX < 0x0308) { fprintf(stderr, "Python: Python version %d is lower than 3.8, not loading Python module", PY_VERSION_HEX); return; } PyConfig_InitPythonConfig(&config); - program = Py_DecodeLocale(argv0, NULL); - if (!program) { - PyConfig_Clear(&config); - fprintf(stderr, "Python: Fatal error: This should never happen\n"); - fatal(1); - } - status = PyConfig_SetString(&config, &config.program_name, program); + status = PyConfig_SetBytesString(&config, &config.program_name, argv0); if (PyStatus_Exception(status)) { PyConfig_Clear(&config); fprintf(stderr, "Python: Fatal error: Could not set program base path\n"); - fatal(1); + Py_ExitStatusException(status); } if (PyImport_AppendInittab("eggdrop", &PyInit_eggdrop) == -1) { fprintf(stderr, "Error: could not extend in-built modules table\n"); @@ -97,6 +88,7 @@ static void init_python() { fprintf(stderr, "Python: Fatal error: Could not initialize config\n"); fatal(1); } + PyConfig_Clear(&config); PyDateTime_IMPORT; pmodule = PyImport_ImportModule("eggdrop"); if (!pmodule) { @@ -119,7 +111,6 @@ static void kill_python() { if (Py_FinalizeEx() < 0) { exit(120); } - PyMem_RawFree(Py_DecodeLocale("eggdrop", NULL)); return; } From 0a22d0d6588ed81511a8aa262710598ed4ff0e86 Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 14 Jan 2024 17:14:30 +0100 Subject: [PATCH 68/71] Update --- Makefile.in | 3 +- doc/sphinx_source/modules/mod/python.rst | 23 +- scripts/eggdroppy/__init__.py | 2 - scripts/eggdroppy/binds.py | 248 ------------------ scripts/eggdroppy/cmds.py | 39 --- scripts/eggdroppy/flags.py | 103 -------- src/mod/Makefile.in | 12 +- src/mod/python.mod/pycmds.c | 35 ++- src/mod/python.mod/python.c | 118 ++------- .../{examples => scripts}/bestfriend.py | 0 .../python.mod/{examples => scripts}/greet.py | 0 .../python.mod/{examples => scripts}/imdb.py | 0 .../{examples => scripts}/listtls.py | 0 .../{examples => scripts}/urlTitle.py | 0 src/mod/python.mod/tclpython.c | 81 +++--- 15 files changed, 112 insertions(+), 552 deletions(-) delete mode 100644 scripts/eggdroppy/__init__.py delete mode 100644 scripts/eggdroppy/binds.py delete mode 100644 scripts/eggdroppy/cmds.py delete mode 100644 scripts/eggdroppy/flags.py rename src/mod/python.mod/{examples => scripts}/bestfriend.py (100%) rename src/mod/python.mod/{examples => scripts}/greet.py (100%) rename src/mod/python.mod/{examples => scripts}/imdb.py (100%) rename src/mod/python.mod/{examples => scripts}/listtls.py (100%) rename src/mod/python.mod/{examples => scripts}/urlTitle.py (100%) diff --git a/Makefile.in b/Makefile.in index 733e3e613..93de77211 100644 --- a/Makefile.in +++ b/Makefile.in @@ -490,6 +490,7 @@ install-doc: install-start cd doc/ && $(MAKE_INSTALL) install install-scripts: install-start - +@cd scripts/ && $(MAKE_INSTALL) install + +@cd scripts/ && $(MAKE_INSTALL) install; \ + cd ../src/mod && $(MAKE_INSTALL) install-scripts #safety hash diff --git a/doc/sphinx_source/modules/mod/python.rst b/doc/sphinx_source/modules/mod/python.rst index 86c26ec68..1a26a291c 100644 --- a/doc/sphinx_source/modules/mod/python.rst +++ b/doc/sphinx_source/modules/mod/python.rst @@ -30,13 +30,16 @@ python You can run a python command from the partyline with the .python command, such as:: - .python print('Hello world!') + .python 1 + 1 + Python: 2 + .python from eggdrop.tcl import putmsg; putmsg('#chan', 'Hello world!') + Python: None ^^^^^^^^^^^^^ .binds python ^^^^^^^^^^^^^ -The python module extends the core ``.binds`` command by adding a ``python`` mask. This command will list all binds for python scripts. +The python module extends the core ``.binds`` partyline command by adding a ``python`` mask. This command will list all binds for python scripts. ------------ Tcl Commands @@ -54,7 +57,21 @@ Eggdrop Python Commands The Python module is built to use the existing core Tcl commands integrated into Eggdrop via the ``eggdrop.tcl`` module. To call an existing Tcl command from Python, you can either load the entire catalog by running ``import eggdrop.tcl``, or be more specific by ``from eggdrop.tcl import putserv, putlog, chanlist``, etc. -Additionally, a few extra python commands have been created for use: +Arguments to the Tcl functions are automatically converted as follows: + +* ``None`` is converted to an empty Tcl object (the empty string, ``""``) +* ``List`` and ``Tuple`` is converted to a ``Tcl list`` +* ``Dict`` is converted to a ``Tcl dictionary`` +* Everything else is converted to a string using the str() method + +Return values from Tcl functions must be manually converted: + +* ``""`` the empty string is automatically converted to None +* everything else is returned as string +* ``Tcl list`` as string can be converted to a Python ``List`` using ``parse_tcl_list`` +* ``Tcl dictionary`` as string can be converted to a Python ``Dict`` using ``parse_tcl_list`` + +Additionally, a few extra python commands have been created for use without these conversions: ^^^^^^^^^^^^^^^^ bind diff --git a/scripts/eggdroppy/__init__.py b/scripts/eggdroppy/__init__.py deleted file mode 100644 index bbaa72631..000000000 --- a/scripts/eggdroppy/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .flags import * -from .cmds import * diff --git a/scripts/eggdroppy/binds.py b/scripts/eggdroppy/binds.py deleted file mode 100644 index 8c7238903..000000000 --- a/scripts/eggdroppy/binds.py +++ /dev/null @@ -1,248 +0,0 @@ -from dataclasses import dataclass -from typing import Callable -import re -import uuid -import sys -from pprint import pprint, pformat -import eggdrop -from eggdroppy.flags import FlagRecord, FlagMatcher -from eggdroppy.cmds import putmsg, putnotc -from dataclasses import dataclass -from datetime import datetime - -bindtypes = { - "pub": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, - "pubm": {"args": ("nick", "host", "handle", "channel", "text"), "reply": "chanmsg"}, - "msg": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, - "msgm": {"args": ("nick", "host", "handle", "text"), "reply": "privmsg"}, - "dcc": {"args": ("handle", "idx", "text"), "reply": "dcc"}, - "join": {"args": ("nick", "host", "handle", "channel"), "reply": "privnotc"} -""" - "fil": {"args": ("handle", "idx", "text"), "reply": "xxx"}, - "notc": {"args": ("nick", "host", "handle", "text", "dest"), "reply": "xxx"}, - "part": {"args": ("nick", "host", "handle", "channel", "msg"), "reply": "xxx"}, - "sign": {"args": ("nick", "host", "handle", "channel", "reason"), "reply": "xxx"}, - "kick": {"args": ("nick", "host", "handle", "channel", "topic"), "reply": "xxx"}, - "nick": {"args": ("nick", "host", "handle", "channel", "newnick"), "reply": "xxx"}, - "mode": {"args": ("nick", "host", "handle", "channel", "mode", "target"), "reply": "xxx"}, - "ctcp": {"args": ("nick", "host", "handle", "dest", "key", "text"), "reply": "xxx"}, - "ctcr": {"args": ("nick", "host", "handle", "dest", "key", "text"), "reply": "xxx"}, - "raw": {"args": ("from", "key", "text"), "reply": "xxx"}, - "bot": {"args": ("bot", "cmd", "text"), "reply": "xxx"}, - "chon": {"args": ("handle", "idx"), "reply": "xxx"}, - "chof": {"args": ("handle", "idx"), "reply": "xxx"}, - "sent": {"args": ("nick", "handle", "file"), "reply": "xxx"}, - "rcvd": {"args": ("nick", "handle", "file"), "reply": "xxx"}, - "chat": {"args": ("handle", "channel", "text"), "reply": "xxx"}, - "link": {"args": ("bot", "via"), "reply": "xxx"}, - "disc": {"args": ("bot"), "reply": "xxx"}, - "splt": {"args": ("nick", "host", "handle", "channel"), "reply": "xxx"}, - "rejn": {"args": ("nick", "host", "handle", "channel"), "reply": "xxx"}, - "filt": {"args": ("idx", "text"), "reply": "xxx"}, - "need": {"args": ("channel", "type"), "reply": "xxx"}, - "flud": {"args": ("nick", "host", "handle", "channel", "type"), "reply": "xxx"}, - "note": {"args": ("from", "to", "text"), "reply": "xxx"}, - "act": {"args": ("handle", "channel", "action"), "reply": "xxx"}, - "wall": {"args": ("from", "msg"), "reply": "xxx"}, - "bcst": {"args": ("bot", "channel", "text"), "reply": "xxx"}, - "chjn": {"args": ("bot", "host", "handle", "channel", "flag", "idx"), "reply": "xxx"}, - "chpt": {"args": ("bot", "handle", "channel", "idx"), "reply": "xxx"}, - "time": {"args": ("min", "hour", "day", "month", "year"), "reply": "xxx"}, - "away": {"args": ("bot", "idx", "text"), "reply": "xxx"}, - "load": {"args": ("module"), "reply": "xxx"}, - "unld": {"args": ("module"), "reply": "xxx"}, - "nkch": {"args": ("old", "new"), "reply": "xxx"}, - "evnt": {"args": ("type"), "reply": "xxx"}, - "lost": {"args": ("nick", "handle", "path", "bytes", "length"), "reply": "xxx"}, - "tout": {"args": ("nick", "handle", "path", "bytes", "length"), "reply": "xxx"}, - "out": {"args": ("queue", "text", "sent"), "reply": "xxx"}, - "cron": {"args": ("min", "hour", "day", "month", "weekday"), "reply": "xxx"}, - "log": {"args": ("channel", "text", "level"), "reply": "xxx"}, - "tls": {"args": ("idx"), "reply": "xxx"}, - "die": {"args": ("reason"), "reply": "xxx"}, - "ircaway": {"args": ("nick", "host", "handle", "channel", "msg"), "reply": "xxx"}, - "invt": {"args": ("nick", "host", "handle", "channel", "invitee"), "reply": "xxx"}, - "rawt": {"args": ("from", "key", "text", "tag"), "reply": "xxx"}, - "account": {"args": ("nick", "host", "handle", "channel", "account"), "reply": "xxx"}, - "isupport": {"args": ("key", "isset", "value"), "reply": "xxx"}, - "monitor": {"args": ("nick", "online"), "reply": "xxx"} -""" -} - -@dataclass -class IRCUser: - nick: str - host: str - account: str - lastseen: datetime = None - joined: datetime = None - -@dataclass -class Bind: - bindtype: str - flags: str - mask: str - callback: Callable - hits: int = 0 - - @property - def id(self): - return f'{self.bindtype}{hex(id(self))[2:]}' - -class BindCallback: - - @staticmethod - def make_replyfunc(replytype, argdict): - replyfunc = None - if replytype == "chanmsg": - def replyfunc(response): - putmsg(argdict["channel"], response) - elif replytype == "privmsg": - def replyfunc(response): - putmsg(argdict["nick"], response) - elif replytype == "privnotc": - def replyfunc(response): - putnotc(argdict["nick"], response) - elif replytype == "dcc": - def replyfunc(response): - # TODO: putdcc - print(f"Python DCC response: {response}") - return replyfunc - - def __init__(self, bindtype, mask, callback : Callable): - self.__callback = callback - self.__bindtype = bindtype - self.__mask = mask - - def __call__(self, *args): - pprint(args) - bindinfo = bindtypes[self.__bindtype] - - kwargs = {"bindtype": self.__bindtype, "mask": self.__mask} - kwargs.update(zip(bindinfo["args"], args)) - if "nick" in kwargs: - ircuser_dict = eggdrop.findircuser(kwargs["nick"], kwargs["channel"]) if "channel" in kwargs else eggdrop.findircuser(kwargs["nick"]) - kwargs["ircuser"] = IRCUser(**ircuser_dict) - if "reply" in bindinfo: - kwargs["reply"] = self.make_replyfunc(bindinfo["reply"], argdict=kwargs) - - pprint(kwargs) - self.__callback(**kwargs) - - def __str__(self): - return self.__callback.__name__ - -class BindType: - """ A BindType is an event that can trigger an Eggdrop response - - Each event that Eggdrop refers to, called a bind, requires a :class:`BindType` to be loaded by the - :class:`Binds` class. - - Args: - bindtype (string): A string representing one of the core Eggdrop bind types - managed (bool): True if bindtype is managed by Eggdrop - """ - def __init__(self, bindtype, managed): - self.__bindtype = bindtype - self.__managed = managed - self.__binds = {} - - @staticmethod - def make_callback_func(bindtype, mask, callback): - return BindCallback(bindtype, mask, callback) - - def add(self, mask : str, callback : Callable, flags : str = "-"): - """ Register a new bind event - - Adds a new :class:`BindType` attribute to a :class:`Bind` object. - - Args: - flags (object): a flag object, we'll figure this out soon - mask (str): mask or command or something, maybe find a better word here - callback (method): The name of the function you wish to call when the event is triggered - """ - cb = self.make_callback_func(bindtype=self.__bindtype, mask=mask, callback=callback) - bind = Bind(flags=flags, mask=mask, callback=cb, bindtype=self.__bindtype) - self.__binds[bind.id] = bind - if self.__managed: - eggdrop.bind(self.__bindtype, flags, mask, cb) - - def delete(self, bindid): - bind = self.__binds[bindid] - if self.__managed: - eggdrop.unbind(self.__bindtype, bind.flags, bind.mask, bind.callback) - if bindid in self.__binds: - del self.__binds[bindid] - - def list(self): - """ List all binds of the ``bindtype`` - - Returns: - list: A list of binds, in the format {A B C D} - """ - return self.__binds - - def all(self): - return self.list() - - def __str__(self): - return f"{self.__bindtype}-binds: {str(self.__binds)}" - -class Binds: - """ A :class:`Binds` object holds a collection of :class:`BindTypes` objects - - All binds that are added to Eggdrop are collected and accessed through a :class:`Binds` object. Each - event type that Eggdrop reacts to is added to the :class:`Binds` object as a bind via a - :class:`BindTypes` object. - - Args: None - """ - def __init__(self): - self.__binds = {x: BindType(x, True) for x in bindtypes.keys()} - - def __getattr__(self, name): - return self.__binds[name] - - def all(self): - """ Lists all binds registered with the object - - Returns: - list: A list, or maybe a dict? of all binds - """ - return self.__binds - - def types(self): - """ Lists all :class:`BindType` attributes added to the :class:`Binds` object - - Returns: - list: maybe a list? of attributes - """ - return self.__binds.keys() - - def __str__(self): - return [{x: [str(b) for b in y]} for x, y in self.__binds.items()] - - -__allbinds = Binds() - -for bindtype in __allbinds.types(): - setattr(sys.modules[__name__], bindtype, getattr(__allbinds, bindtype)) - -def all(): - return __allbinds.all() - -def types(): - return __allbinds.types() - -def print_all(reply, **kwargs): - reply("{0: <8} | {1: <18} | {2: <12} | {3: <24} | {4}".format('ID', 'function', 'flags', 'mask', 'hits')) - for i in types(): - if __allbinds.all()[i].all(): - reply("-"*78) - reply(f'{i:<8}') - reply("-"*78) - for j in __allbinds.all()[i].all().keys(): - reply(f'{j} | {str(__allbinds.all()[i].all()[j].callback):<18} | {str(__allbinds.all()[i].all()[j].flags):<12} | {__allbinds.all()[i].all()[j].mask:<24} | {__allbinds.all()[i].all()[j].hits:<4}') - reply("-"*78) - -__allbinds.dcc.add(mask='pybinds', callback=print_all) diff --git a/scripts/eggdroppy/cmds.py b/scripts/eggdroppy/cmds.py deleted file mode 100644 index d86da1664..000000000 --- a/scripts/eggdroppy/cmds.py +++ /dev/null @@ -1,39 +0,0 @@ -from enum import IntEnum -import eggdrop - -class IRCQueue(IntEnum): - NOQUEUE = 0 - SERVER = eggdrop.QUEUE_SERVER - HELP = eggdrop.QUEUE_HELP - QUICK = MODE = eggdrop.QUEUE_MODE - -def ircsend(text, queue = IRCQueue.SERVER, make_first=False): - if queue == IRCQueue.QUICK and make_first: - queuenum = eggdrop.QUEUE_MODE_NEXT - elif queue == IRCQueue.SERVER and make_first: - queuenum = eggdrop.QUEUE_SERVER_NEXT - elif queue == IRCQueue.HELP and make_first: - queuenum = eggdrop.QUEUE_HELP_NEXT - elif queue == IRCQueue.NOQUEUE: - raise Exception("Not implemented yet") - eggdrop.ircsend(text.rstrip('\r\n'), queue) - -# unnecessary shorthands (?) -def putserv(text, make_first=False): - ircsend(text, queue=IRCQueue.SERVER, make_first=make_first) - -def puthelp(text, make_first=False): - ircsend(text, queue=IRCQueue.HELP, make_first=make_first) - -def putquick(text, make_first=False): - ircsend(text, queue=IRCQueue.MODE, make_first=make_first) - -# useful shorthands -def putmsg(dst, text): - for line in text.split('\n'): - ircsend(f"PRIVMSG {dst} :{line}") - -def putnotc(dst, text): - for line in text.split('\n'): - ircsend(f"NOTICE {dst} :{line}") - diff --git a/scripts/eggdroppy/flags.py b/scripts/eggdroppy/flags.py deleted file mode 100644 index b6ed22a9d..000000000 --- a/scripts/eggdroppy/flags.py +++ /dev/null @@ -1,103 +0,0 @@ -from enum import IntFlag -from pprint import pprint -import eggdrop - -# TODO: sort these properly -class UserFlags(IntFlag): - n = owner = eggdrop.USER_OWNER - m = master = eggdrop.USER_MASTER - a = autoop = eggdrop.USER_AUTOOP - o = op = eggdrop.USER_OP - g = autovoice = eggdrop.USER_GVOICE - v = voice = eggdrop.USER_VOICE - b = bot = eggdrop.USER_BOT - c = common = eggdrop.USER_COMMON - d = deop = eggdrop.USER_DEOP - e = exempt = eggdrop.USER_EXEMPT - f = friend = eggdrop.USER_FRIEND - h = highlight = eggdrop.USER_HIGHLITE - j = janitor = eggdrop.USER_JANITOR - k = autokick = eggdrop.USER_KICK - l = halfop = eggdrop.USER_HALFOP - p = partyline = eggdrop.USER_PARTY - q = devoice = eggdrop.USER_QUIET - r = dehalfop = eggdrop.USER_DEHALFOP - t = botnetmaster = eggdrop.USER_BOTMAST - u = unshared = eggdrop.USER_UNSHARED - w = wasoptest = eggdrop.USER_WASOPTEST - x = xfer = eggdrop.USER_XFER - y = autohalfop = eggdrop.USER_AUTOHALFOP - z = washalfoptest = eggdrop.USER_WASHALFOPTEST - - def __repr__(self): - if self.value == 0: - return "-" - return ''.join(f.name for f in self.__class__ if f.value & self.value) - -class FlagRecord: - def __init__(self, globalflags=None, chanflags=None, botflags=None): - self.globl = UserFlags(globalflags) - self.chan = UserFlags(chanflags) - self.bot = UserFlags(botflags) - - def __str__(self): - return 'globl: {}, chan: {}, bot: {}'.format(str(self.globl), str(self.chan), str(self.bot)) - - def __repr__(self): - return f"{repr(self.globl)}|{repr(self.chan)}|{repr(self.bot)}" - -class FlagMatcher: - def __init__(self, globalflags=None, globalnegflags=None, chanflags=None, channegflags=None, botflags=None, botnegflags=None, requireall=False): - self.globalflags = globalflags - self.globalnegflags = globalnegflags - self.chanflags = chanflags - self.channegflags = channegflags - self.botflags = botflags - self.botnegflags = botnegflags - self.requireall = requireall - - @staticmethod - def reprflags(pls, mns): - s = "" - if pls: - s += "+" + repr(pls) - if mns: - s += "-" + repr(mns) - return s - - def __repr__(self): - s = "" - sep = "&" if self.requireall else "|" - if not self.globalflags and not self.globalnegflags and not self.chanflags and not self.channegflags and not self.botflags and not self.botnegflags: - return "-" - if self.globalflags or self.globalnegflags: - s += self.reprflags(self.globalflags, self.globalnegflags) - s += sep - if self.chanflags or self.channegflags: - s += self.reprflags(self.chanflags, self.channegflags) - if self.botflags or self.botnegflags: - s += sep - s += self.reprflags(self.botflags, self.botnegflags) - return s - - @staticmethod - def flagcheck(posflags, negflags, requireall, flags): - if not requireall: - if posflags and not posflags & flags: - return False - else: - if posflags and not posflags & flags == posflags: - return False - if negflags and negflags & flags: - return False - return True - - def match(self, flags : FlagRecord): - if not FlagMatcher.flagcheck(self.globalflags, self.globalnegflags, self.requireall, flags.globl): - return False - if not FlagMatcher.flagcheck(self.chanflags, self.channegflags, self.requireall, flags.chan): - return False - if not FlagMatcher.flagcheck(self.botflags, self.botnegflags, self.requireall, flags.bot): - return False - return True - diff --git a/src/mod/Makefile.in b/src/mod/Makefile.in index ca742f69a..1d32f9180 100644 --- a/src/mod/Makefile.in +++ b/src/mod/Makefile.in @@ -117,7 +117,7 @@ distclean: fi; \ done -install: install-help install-language +install: install-help install-language install-scripts install-help: @echo "Copying module help files." && \ @@ -169,4 +169,14 @@ install-language: fi; \ done; +install-scripts: + @for i in $(mods); do \ + if test ! "x`echo $(srcdir)/$$i/scripts/*`" = "x$(srcdir)/$$i/scripts/*"; then \ + echo "Installing example $$i scripts"; \ + for s in $(srcdir)/$$i/scripts/*; do \ + $(INSTALL_DATA) $$s $(DEST)/scripts/; \ + done; \ + fi; \ + done; + #safety hash diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 2855ed0a3..6d711ec68 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -1,3 +1,24 @@ +/* + * pycmds.c -- python.mod python functions + */ + +/* + * Copyright (C) 2020 - 2021 Eggheads Development Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #define PY_SSIZE_T_CLEAN #include #include @@ -25,19 +46,6 @@ static PyObject *EggdropError; //create static Python Exception object static Tcl_Obj *py_to_tcl_obj(PyObject *o); // generic conversion function -static PyObject *py_ircsend(PyObject *self, PyObject *args) { - char *text; - int queuenum; - - if (!PyArg_ParseTuple(args, "si", &text, &queuenum)) { - PyErr_SetString(EggdropError, "wrong number of args"); - return NULL; - } - - dprintf(queuenum, "%s\n", text); - Py_RETURN_NONE; -} - static PyObject *py_displayhook(PyObject *self, PyObject *o) { PyObject *pstr; @@ -357,7 +365,6 @@ static PyObject *py_findtclfunc(PyObject *self, PyObject *args) { } static PyMethodDef MyPyMethods[] = { - {"ircsend", py_ircsend, METH_VARARGS, "Send message to server"}, {"bind", py_bind, METH_VARARGS, "register an eggdrop python bind"}, {"findircuser", py_findircuser, METH_VARARGS, "find an IRC user by nickname and optional channel"}, {"parse_tcl_list", py_parse_tcl_list, METH_VARARGS, "convert a Tcl list string to a Python list"}, diff --git a/src/mod/python.mod/python.c b/src/mod/python.mod/python.c index f5aa2b396..4cb3b70d4 100644 --- a/src/mod/python.mod/python.c +++ b/src/mod/python.mod/python.c @@ -1,5 +1,5 @@ /* - * python.c -- part of python.mod + * python.c -- python interpreter handling for python.mod */ /* @@ -46,46 +46,40 @@ static Function *global = NULL, *irc_funcs = NULL; #include "src/mod/python.mod/pycmds.c" #include "src/mod/python.mod/tclpython.c" -//extern p_tcl_bind_list H_pubm; +EXPORT_SCOPE char *python_start(Function *global_funcs); -int runPythonArgs(const char *script, const char *method, int argc, char **argv); -int runPythonPyArgs(const char *script, const char *method, PyObject *pArgs); - - -/* Calculate the memory we keep allocated. - */ static int python_expmem() { - int size = 0; - - Context; - return size; + return 0; // TODO } +// TODO: Do we really have to exit eggdrop on module load failure? static void init_python() { PyObject *pmodule; PyStatus status; PyConfig config; if (PY_VERSION_HEX < 0x0308) { - fprintf(stderr, "Python: Python version %d is lower than 3.8, not loading Python module", PY_VERSION_HEX); + putlog(LOG_MISC, "*", "Python: Python version %d is lower than 3.8, not loading Python module", PY_VERSION_HEX); return; } - PyConfig_InitPythonConfig(&config); + PyConfig_InitIsolatedConfig(&config); + config.install_signal_handlers = 0; + config.parse_argv = 0; status = PyConfig_SetBytesString(&config, &config.program_name, argv0); if (PyStatus_Exception(status)) { PyConfig_Clear(&config); - fprintf(stderr, "Python: Fatal error: Could not set program base path\n"); + putlog(LOG_MISC, "*", "Python: Fatal error: Could not set program base path"); Py_ExitStatusException(status); } if (PyImport_AppendInittab("eggdrop", &PyInit_eggdrop) == -1) { - fprintf(stderr, "Error: could not extend in-built modules table\n"); + putlog(LOG_MISC, "*", "Python: Error: could not extend in-built modules table"); exit(1); } status = Py_InitializeFromConfig(&config); if (PyStatus_Exception(status)) { PyConfig_Clear(&config); - fprintf(stderr, "Python: Fatal error: Could not initialize config\n"); + putlog(LOG_MISC, "*", "Python: Fatal error: Could not initialize config"); fatal(1); } PyConfig_Clear(&config); @@ -93,13 +87,15 @@ static void init_python() { pmodule = PyImport_ImportModule("eggdrop"); if (!pmodule) { PyErr_Print(); - fprintf(stderr, "Error: could not import module 'eggdrop'\n"); + putlog(LOG_MISC, "*", "Error: could not import module 'eggdrop'"); + fatal(1); } pirp = PyImport_AddModule("__main__"); pglobals = PyModule_GetDict(pirp); PyRun_SimpleString("import sys"); + // TODO: Relies on pwd() staying eggdrop main dir PyRun_SimpleString("sys.path.append(\".\")"); PyRun_SimpleString("import eggdrop"); PyRun_SimpleString("sys.displayhook = eggdrop.__displayhook__"); @@ -114,81 +110,9 @@ static void kill_python() { return; } -int runPythonPyArgs(const char *script, const char *method, PyObject *pArgs) -{ - PyObject *pName, *pModule, *pFunc, *pValue; - - pName = PyUnicode_DecodeFSDefault(script); - /* Error checking of pName left out */ - pModule = PyImport_Import(pName); - Py_DECREF(pName); - - if (pModule != NULL) { - pFunc = PyObject_GetAttrString(pModule, method); - /* pFunc is a new reference */ - if (pFunc && PyCallable_Check(pFunc)) { - pValue = PyObject_CallObject(pFunc, pArgs); - Py_DECREF(pArgs); - if (pValue != NULL) { - printf("Result of call: %ld\n", PyLong_AsLong(pValue)); - Py_DECREF(pValue); - } - else { - Py_DECREF(pFunc); - Py_DECREF(pModule); - PyErr_Print(); - fprintf(stderr,"Call failed\n"); - return 1; - } - } - else { - if (PyErr_Occurred()) - PyErr_Print(); - fprintf(stderr, "Cannot find function \"%s\"\n", method); - } - Py_XDECREF(pFunc); - Py_DECREF(pModule); - } - else { - PyErr_Print(); - fprintf(stderr, "Failed to load \"%s\"\n", script); - return 1; - } - return 0; -} - -int runPythonArgs(const char *script, const char *method, int argc, char **argv) -{ - PyObject *pArgs, *pValue; - - pArgs = PyTuple_New(argc); - for (int i = 0; i < argc; i++) { - pValue = Py_BuildValue("s", argv[i]); - if (!pValue) { - Py_DECREF(pArgs); - fprintf(stderr, "Cannot convert argument at position %d: '%s'\n", i, argv[i]); - return 1; - } - /* pValue reference stolen here: */ - PyTuple_SetItem(pArgs, i, pValue); - } - return runPythonPyArgs(script, method, pArgs); -} - -/* A report on the module status. - * - * details is either 0 or 1: - * 0 - `.status' - * 1 - `.status all' or `.module twitch' - */ static void python_report(int idx, int details) { - if (details) { - int size = python_expmem(); - - dprintf(idx, " Using %d byte%s of memory\n", size, - (size != 1) ? "s" : ""); - } + // TODO } static char *python_close() @@ -201,8 +125,6 @@ static char *python_close() return NULL; } -EXPORT_SCOPE char *python_start(); - static Function python_table[] = { (Function) python_start, (Function) python_close, @@ -225,16 +147,12 @@ char *python_start(Function *global_funcs) module_undepend(MODULE_NAME); return "This module requires Eggdrop 1.9.0 or later."; } + // TODO: Is this dependency necessary? It auto-loads irc.mod, that might be undesired if (!(irc_funcs = module_depend(MODULE_NAME, "irc", 1, 5))) { module_undepend(MODULE_NAME); return "This module requires irc module 1.5 or later."; } -/* - if (!(server_funcs = module_depend(MODULE_NAME, "channels", 1, 1))) { - module_undepend(MODULE_NAME); - return "This module requires channels module 1.1 or later."; - } -*/ + // irc.mod depends on server.mod and channels.mod, so those were implicitely loaded init_python(); @@ -242,4 +160,4 @@ char *python_start(Function *global_funcs) add_builtins(H_dcc, mydcc); add_tcl_commands(my_tcl_cmds); return NULL; -} +} \ No newline at end of file diff --git a/src/mod/python.mod/examples/bestfriend.py b/src/mod/python.mod/scripts/bestfriend.py similarity index 100% rename from src/mod/python.mod/examples/bestfriend.py rename to src/mod/python.mod/scripts/bestfriend.py diff --git a/src/mod/python.mod/examples/greet.py b/src/mod/python.mod/scripts/greet.py similarity index 100% rename from src/mod/python.mod/examples/greet.py rename to src/mod/python.mod/scripts/greet.py diff --git a/src/mod/python.mod/examples/imdb.py b/src/mod/python.mod/scripts/imdb.py similarity index 100% rename from src/mod/python.mod/examples/imdb.py rename to src/mod/python.mod/scripts/imdb.py diff --git a/src/mod/python.mod/examples/listtls.py b/src/mod/python.mod/scripts/listtls.py similarity index 100% rename from src/mod/python.mod/examples/listtls.py rename to src/mod/python.mod/scripts/listtls.py diff --git a/src/mod/python.mod/examples/urlTitle.py b/src/mod/python.mod/scripts/urlTitle.py similarity index 100% rename from src/mod/python.mod/examples/urlTitle.py rename to src/mod/python.mod/scripts/urlTitle.py diff --git a/src/mod/python.mod/tclpython.c b/src/mod/python.mod/tclpython.c index 4aef45cc0..88a89b2d7 100644 --- a/src/mod/python.mod/tclpython.c +++ b/src/mod/python.mod/tclpython.c @@ -1,7 +1,5 @@ /* - * tclpython.c -- part of python.mod - * contains all tcl functions - * + * tclpython.c -- tcl functions for python.mod */ /* * Copyright (C) 2000 - 2023 Eggheads Development Team @@ -23,62 +21,63 @@ static int tcl_pysource STDVAR { - BADARGS(2, 2, " script"); - FILE *fp; - PyObject *pobj, *pstr, *ptype, *pvalue, *ptraceback; - PyObject *pystr, *module_name, *pymodule, *pyfunc, *pyval, *item; + PyObject *pobj, *ptype, *pvalue, *ptraceback; + PyObject *pystr; Py_ssize_t n; const char *res = NULL; - char *res2 = NULL; int i; + BADARGS(2, 2, " script"); + if (!(fp = fopen(argv[1], "r"))) { Tcl_AppendResult(irp, "Error: could not open file ", argv[1],": ", strerror(errno), NULL); return TCL_ERROR; } PyErr_Clear(); + // Always PyNone or NULL on exception pobj = PyRun_FileEx(fp, argv[1], Py_file_input, pglobals, pglobals, 1); - if (pobj) { - pstr = PyObject_Str(pobj); - Tcl_AppendResult(irp, PyUnicode_AsUTF8(pstr), NULL); - Py_DECREF(pstr); - Py_DECREF(pobj); - } else if (PyErr_Occurred()) { + Py_XDECREF(pobj); + + if (PyErr_Occurred()) { PyErr_Fetch(&ptype, &pvalue, &ptraceback); pystr = PyObject_Str(pvalue); Tcl_AppendResult(irp, "Error loading python: ", PyUnicode_AsUTF8(pystr), NULL); - module_name = PyUnicode_FromString("traceback"); - pymodule = PyImport_Import(module_name); - Py_DECREF(module_name); - // format backtrace and print - pyfunc = PyObject_GetAttrString(pymodule, "format_exception"); - if (pyfunc && PyCallable_Check(pyfunc)) { - pyval = PyObject_CallFunctionObjArgs(pyfunc, ptype, pvalue, ptraceback, NULL); - // Check if traceback is a list and handle as such - if (PyList_Check(pyval)) { - n = PyList_Size(pyval); - for (i = 0; i < n; i++) { - item = PyList_GetItem(pyval, i); - pystr = PyObject_Str(item); - //Python returns a const char but we need to remove the \n - res = PyUnicode_AsUTF8(pystr); - if (strlen(res)) { - res2 = (char*) nmalloc(strlen(res)); - // Remove trailing \n - strlcpy(res2, res, strlen(res)-1); - } - putlog(LOG_MISC, "*", "%s", res2); - if (res2 != NULL) { - nfree(res2); + Py_DECREF(pystr); + // top level syntax errors do not have a traceback + if (ptraceback) { + PyObject *module_name, *pymodule, *pyfunc, *pyval, *item; + + module_name = PyUnicode_FromString("traceback"); + pymodule = PyImport_Import(module_name); + Py_DECREF(module_name); + // format backtrace and print + pyfunc = PyObject_GetAttrString(pymodule, "format_exception"); + + if (pyfunc && PyCallable_Check(pyfunc)) { + pyval = PyObject_CallFunctionObjArgs(pyfunc, ptype, pvalue, ptraceback, NULL); + + if (pyval && PyList_Check(pyval)) { + n = PyList_Size(pyval); + for (i = 0; i < n; i++) { + item = PyList_GetItem(pyval, i); + pystr = PyObject_Str(item); + res = PyUnicode_AsUTF8(pystr); + // strip \n + putlog(LOG_MISC, "*", "%.*s", (int)(strlen(res) - 1), res); + Py_DECREF(pystr); } + } else { + putlog(LOG_MISC, "*", "Error fetching python traceback"); } - } else { - pystr = PyObject_Str(pyval); - Tcl_AppendResult(irp, PyUnicode_AsUTF8(pystr), NULL); + Py_XDECREF(pyval); } - Py_DECREF(pyval); + Py_XDECREF(pyfunc); + Py_DECREF(pymodule); } + Py_XDECREF(ptype); + Py_XDECREF(pvalue); + Py_XDECREF(ptraceback); return TCL_ERROR; } return TCL_OK; From ecd5e7e40165226a77970e3b4bec43cda565f7da Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 14 Jan 2024 17:22:17 +0100 Subject: [PATCH 69/71] Do not overwrite existing scripts on make install --- src/mod/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mod/Makefile.in b/src/mod/Makefile.in index 1d32f9180..4ba69f467 100644 --- a/src/mod/Makefile.in +++ b/src/mod/Makefile.in @@ -174,7 +174,9 @@ install-scripts: if test ! "x`echo $(srcdir)/$$i/scripts/*`" = "x$(srcdir)/$$i/scripts/*"; then \ echo "Installing example $$i scripts"; \ for s in $(srcdir)/$$i/scripts/*; do \ - $(INSTALL_DATA) $$s $(DEST)/scripts/; \ + if test ! -f "$(DEST)/scripts/`basename "$$s"`"; then \ + $(INSTALL_DATA) $$s $(DEST)/scripts/; \ + fi; \ done; \ fi; \ done; From e91cb552675c40c793bca764c5364c4539399f5f Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 14 Jan 2024 21:04:07 +0100 Subject: [PATCH 70/71] Fix warning --- src/mod/python.mod/pycmds.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/mod/python.mod/pycmds.c b/src/mod/python.mod/pycmds.c index 6d711ec68..302dd82b5 100644 --- a/src/mod/python.mod/pycmds.c +++ b/src/mod/python.mod/pycmds.c @@ -87,20 +87,18 @@ static void cmd_python(struct userrec *u, int idx, char *par) { if (pyfunc && PyCallable_Check(pyfunc)) { pyval = PyObject_CallFunctionObjArgs(pyfunc, ptype, pvalue, ptraceback, NULL); // Check if traceback is a list and handle as such - if (pyval) { - if (pyval && PyList_Check(pyval)) { - n = PyList_Size(pyval); - for (i = 0; i < n; i++) { - item = PyList_GetItem(pyval, i); - pystr = PyObject_Str(item); - dprintf(idx, "%s", PyUnicode_AsUTF8(pystr)); - } - } else { - pystr = PyObject_Str(pyval); + if (pyval && PyList_Check(pyval)) { + n = PyList_Size(pyval); + for (i = 0; i < n; i++) { + item = PyList_GetItem(pyval, i); + pystr = PyObject_Str(item); dprintf(idx, "%s", PyUnicode_AsUTF8(pystr)); } - Py_DECREF(pyval); + } else { + pystr = PyObject_Str(pyval); + dprintf(idx, "%s", PyUnicode_AsUTF8(pystr)); } + Py_XDECREF(pyval); } } return; From 2b571ed473efd47df7ae727495cb9483303b22ef Mon Sep 17 00:00:00 2001 From: Thomas Sader Date: Sun, 14 Jan 2024 21:05:32 +0100 Subject: [PATCH 71/71] Remove obsolete scripts --- scripts/myscript/__init__.py | 1 - scripts/myscript/myscript.py | 40 ------------------------------------ 2 files changed, 41 deletions(-) delete mode 100644 scripts/myscript/__init__.py delete mode 100644 scripts/myscript/myscript.py diff --git a/scripts/myscript/__init__.py b/scripts/myscript/__init__.py deleted file mode 100644 index 37b59a952..000000000 --- a/scripts/myscript/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import myscript diff --git a/scripts/myscript/myscript.py b/scripts/myscript/myscript.py deleted file mode 100644 index 42ac27ab3..000000000 --- a/scripts/myscript/myscript.py +++ /dev/null @@ -1,40 +0,0 @@ -import requests -from bs4 import BeautifulSoup -from eggdroppy import binds, FlagMatcher, UserFlags as perm, putmsg -from pprint import pprint - -def pubGetTitle(nick, host, handle, channel, text, **kwargs): - print(text) - reqs = requests.get(text) - soup = BeautifulSoup(reqs.text, 'html.parser') - putmsg(chan, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) - -def pubmGetTitle(nick, host, handle, channel, text, **kwargs): - print(text) - reqs = requests.get(text.split()[1]) - soup = BeautifulSoup(reqs.text, 'html.parser') - putmsg(channel, "The title of the webpage is: "+soup.find_all('title')[0].get_text()) - -def joinGreetUser(nick, host, handle, channel, **kwargs): - putmsg(channel, f"Hello {nick}, welcome to {channel}") - -# Called from pub or msg, responds public or privately -def mypub(reply, ircuser, **kwargs): - reply(f"{ircuser.nick}, you said !moo, your current account is {ircuser.account}") - #putmsg(chan, "!!! "+nick+"+ on "+chan+" said "+text) - return - -def joinGreetOp(nick, channel, reply, **kwargs): - reply(f"Hello {nick}, welcome to {channel}, you are an operator") - -def mypub2(nick, user, hand, chan, text, **kwargs): - print("!!! "+nick+"+ on "+chan+" said "+text+" and is a global +o") - -binds.pub.add(callback=mypub, mask="!moo") -binds.msg.add(callback=mypub, mask="!moo") -#binds.add("pubm", "!moo*", binds.FlagMatcher(globalflags=binds.UserFlags.o), "*", mypub2) -#binds.add("pub", "!title", binds.FlagMatcher(), "*", pubGetTitle) -#binds.add("pubm", "what*", binds.FlagMatcher(), "*", pubmGetTitle) -binds.join.add(callback=joinGreetUser, mask="*") -binds.join.add(callback=joinGreetOp, flags="+mno|+mno", mask="*") -pprint(binds.all())