Bugfix: Use only .py decoders, ignore .pyc files.

[libsigrokdecode.git] / decode.c

diff --git a/decode.c b/decode.c
index e6399db72ce346bf6d2dfc4e378a11ac0a2bcb4e..598b2ba50be0c81299340bbe089ffdcd7a283009 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -21,27 +21,65 @@
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <stdio.h>
 #include <string.h>
+#include <dirent.h>
+
+/* Re-define some string functions for Python >= 3.0. */
+#if PY_VERSION_HEX >= 0x03000000
+#define PyString_AsString PyBytes_AsString
+#define PyString_FromString PyBytes_FromString
+#define PyString_Check PyBytes_Check
+#endif
+
+/* The list of protocol decoders. */
+GSList *list_pds = NULL;
 
 /**
  * Initialize libsigrokdecode.
  *
- * @return 0 upon success, non-zero otherwise.
+ * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise.
  */
 int sigrokdecode_init(void)
 {
+       DIR *dir;
+       struct dirent *dp;
+       char *tmp;
+
        /* Py_Initialize() returns void and usually cannot fail. */
        Py_Initialize();
 
        /* Add some more search directories for convenience. */
        /* FIXME: Check error code. */
+       /* FIXME: What happens if this function is called multiple times? */
        PyRun_SimpleString(
                "import sys;"
-               "sys.path.append('libsigrokdecode/scripts');"
-               "sys.path.append('../libsigrokdecode/scripts');"
-               "sys.path.append('/usr/local/share/sigrok');"
+               "sys.path.append('libsigrokdecode/decoders');"
+               "sys.path.append('" DECODERS_DIR "');"
                );
 
-       return 0;
+       if (!(dir = opendir(DECODERS_DIR)))
+               return SIGROKDECODE_ERR_DECODERS_DIR;
+
+       while ((dp = readdir(dir)) != NULL) {
+               if (!g_str_has_suffix(dp->d_name, ".py"))
+                       continue;
+               if ((tmp = strdup(dp->d_name)))
+                       list_pds = g_slist_append(list_pds, tmp);
+       }
+       closedir(dir);
+
+       return SIGROKDECODE_OK;
+}
+
+/**
+ * Returns the list of supported/loaded protocol decoders.
+ *
+ * This is a GSList containing the names of the decoders as strings.
+ *
+ * @return List of decoders, NULL if none are supported or loaded.
+ */
+GSList *sigrokdecode_list_decoders(void)
+{
+       return list_pds;
 }
 
 /**
@@ -49,8 +87,8 @@ int sigrokdecode_init(void)
  *
  * TODO: @param entries.
  *
- * @return 0 upon success, non-zero otherwise. The 'outstr' argument will
- *         point to a malloc()ed string upon success.
+ * @return LIBSIGROKDECODE_OK upon success, a (negative) error code otherwise.
+ *         The 'outstr' argument points to a malloc()ed string upon success.
  */
 static int h_str(PyObject *py_res, PyObject *py_func, PyObject *py_mod,
                 const char *key, char **outstr)
@@ -87,14 +125,15 @@ static int h_str(PyObject *py_res, PyObject *py_func, PyObject *py_mod,
 
        Py_DECREF(py_str);
 
-       return 0;
+       return SIGROKDECODE_OK;
 }
 
 /**
  * TODO
  *
  * @param name TODO
- * @return 0 upon success, non-zero otherwise.
+ *
+ * @return LIBSIGROKDECODE_OK upon success, a (negative) error code otherwise.
  */
 int sigrokdecode_load_decoder(const char *name,
                              struct sigrokdecode_decoder **dec)
@@ -166,7 +205,7 @@ int sigrokdecode_load_decoder(const char *name,
 
        *dec = d;
 
-       return 0;
+       return SIGROKDECODE_OK;
 }
 
 /**
@@ -177,7 +216,8 @@ int sigrokdecode_load_decoder(const char *name,
  * @param inbuflen TODO
  * @param outbuf TODO
  * @param outbuflen TODO
- * @return 0 upon success, non-zero otherwise.
+ *
+ * @return LIBSIGROKDECODE_OK upon success, a (negative) error code otherwise.
  */
 int sigrokdecode_run_decoder(struct sigrokdecode_decoder *dec,
                             uint8_t *inbuf, uint64_t inbuflen,
@@ -259,18 +299,18 @@ int sigrokdecode_run_decoder(struct sigrokdecode_decoder *dec,
        Py_DECREF(py_func);
        Py_DECREF(py_mod);
 
-       return 0;
+       return SIGROKDECODE_OK;
 }
 
 /**
  * Shutdown libsigrokdecode.
  *
- * @return 0 upon success, non-zero otherwise.
+ * @return LIBSIGROKDECODE_OK upon success, a (negative) error code otherwise.
  */
 int sigrokdecode_shutdown(void)
 {
        /* Py_Finalize() returns void, any finalization errors are ignored. */
        Py_Finalize();
 
-       return 0;
+       return SIGROKDECODE_OK;
 }