Changeset e38c6d8 for protocols/python/src

Timestamp:

2013-03-17T16:49:05Z (12 years ago)

Author:

Nick Murdoch <nick@…>

Children:

93302ef

Parents:

0147ca9

Message:

Register an (incomplete) plugin per python file found, with name based on module's 'name' variable.

File:

• protocols/python/src/bpython.c (modified) (3 diffs)

protocols/python/src/bpython.c

@@ -25 +25 @@
 #include <bitlbee.h>
 #include <Python.h>
+#include "bytesobject.h"
+
+static void load_pyfile(char * path, PyObject * main_dict) {
+    FILE * pyfile;
+    PyObject * err;
+    struct prpl *ret;
+    ret = g_new0(struct prpl, 1);
+    
+    printf("Loading python file %s\n", path);
+    pyfile = fopen(path, "r");
+    /* Copy main dict to make sure that separate plugins
+       run in separate environments */
+    PyObject * main_dict_copy = PyDict_Copy(main_dict);
+    PyRun_File(pyfile, path, Py_file_input, main_dict_copy, main_dict_copy);
+    
+    PyObject * pluginname = PyDict_GetItemString(main_dict_copy, "name");
+    if ((err = PyErr_Occurred()) || !pluginname) {
+        printf("No plugin name\n");
+        PyErr_Print();
+        g_free(ret);
+        return;
+    }
+    PyObject * pluginname_unicode = PyObject_Unicode(pluginname);
+    PyObject * pluginname_encoded = PyUnicode_AsEncodedString(pluginname_unicode, "ascii", "ignore");
+    if ((err = PyErr_Occurred())) {
+        printf("Error encoding plugin name\n");
+        PyErr_Print();
+        g_free(ret);
+        return;
+    }
+    char * pluginname_tmp; /* reference, do not modify */
+    Py_ssize_t length;
+    PyBytes_AsStringAndSize(pluginname_encoded, &pluginname_tmp, &length);
+    if ((err = PyErr_Occurred())) {
+        printf("Bad plugin name\n");
+        PyErr_Print();
+        g_free(ret);
+        return;
+    }
+    ret->name = g_malloc0(length + 1);
+    memmove(ret->name, pluginname_tmp, length);
+
+    Py_DECREF(pluginname_encoded);
+    Py_DECREF(pluginname_unicode);
+
+    register_protocol(ret);
+}
 
 void init_plugin() {
-    struct prpl *ret = g_new0(struct prpl, 1);
     GDir *dir;
     GError *error = NULL;
@@ -53 +99 @@
             
             if (g_str_has_suffix(path, ".py")) {
-                printf("Loading python file %s\n", path);
-                FILE* pyfile = fopen(path, "r");
-                /* Copy main dict to make sure that separate plugins
-                   run in separate environments */
-                PyObject* main_dict_copy = PyDict_Copy(main_dict);
-                PyRun_File(pyfile, path, Py_file_input, main_dict_copy, main_dict_copy);
-                
+                load_pyfile(path, main_dict);
             }
 
@@ -65 +105 @@
         }
     }
-
-
-    ret->name = "bpython";
-
-    register_protocol(ret);
 
     // Py_Finalize(); // TODO - there's no plugin_unload for us to do this in.