Complete the output of scan results (text or JSON).

1 files changed, 125 insertions, 0 deletions

diff --git a/plugins/pychrysalide/analysis/scan/scanner.c b/plugins/pychrysalide/analysis/scan/scanner.c
index befbc80..e2d5a18 100644
--- a/plugins/pychrysalide/analysis/scan/scanner.c
+++ b/plugins/pychrysalide/analysis/scan/scanner.c
@@ -25,6 +25,7 @@
 #include "scanner.h"
 
 
+#include <malloc.h>
 #include <pygobject.h>
 
 
@@ -34,6 +35,7 @@
 #include <analysis/scan/scanner-int.h>
 
 
+#include "context.h"
 #include "options.h"
 #include "../content.h"
 #include "../../access.h"
@@ -49,6 +51,12 @@ static int py_content_scanner_init(PyObject *, PyObject *, PyObject *);
 /* Lance une analyse d'un contenu binaire. */
 static PyObject *py_content_scanner_analyze(PyObject *, PyObject *);
 
+/* Convertit un gestionnaire de recherches en JSON. */
+static PyObject *py_content_scanner_convert_to_json(PyObject *, PyObject *);
+
+/* Indique le chemin d'un éventuel fichier de source. */
+static PyObject *py_content_scanner_get_filename(PyObject *, void *);
+
 
 
 /******************************************************************************
@@ -188,6 +196,121 @@ static PyObject *py_content_scanner_analyze(PyObject *self, PyObject *args)
 
 /******************************************************************************
 *                                                                             *
+*  Paramètres  : self = classe représentant un format.                        *
+*                args = arguments fournis à l'appel.                          *
+*                                                                             *
+*  Description : Convertit un gestionnaire de recherches en texte.            *
+*                                                                             *
+*  Retour      : Données textuelles ou None en cas d'erreur.                  *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_content_scanner_convert_to_text(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Contexte de suivi à renvoyer*/
+    GScanContext *context;                  /* Contexte d'analyse          */
+    int ret;                                /* Bilan de lecture des args.  */
+    GContentScanner *scanner;               /* Encadrement de recherche    */
+    char *out;                              /* Données en sortie           */
+
+#define CONTENT_SCANNER_CONVERT_TO_TEXT_METHOD PYTHON_METHOD_DEF            \
+(                                                                           \
+    convert_to_text, "$self, context, /",                                   \
+    METH_VARARGS, py_content_scanner,                                       \
+    "Output a scan results as text.\n"                                      \
+    "\n"                                                                    \
+    "The *context* argument is a pychrysalide.analysis.scan.ScanContext"    \
+    " instance provided by a previous call to *self.analyze()*. This"       \
+    " context stores all the scan results.\n"                               \
+    "\n"                                                                    \
+    "The method returns a string value, or *None* in case of failure."      \
+)
+
+    ret = PyArg_ParseTuple(args, "O&", convert_to_scan_context, &context);
+    if (!ret) return NULL;
+
+    scanner = G_CONTENT_SCANNER(pygobject_get(self));
+
+    out = g_content_scanner_convert_to_text(scanner, context);
+
+    if (out != NULL)
+    {
+        result = PyUnicode_FromString(out);
+        free(out);
+    }
+    else
+    {
+        result = Py_None;
+        Py_INCREF(result);
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = classe représentant un format.                        *
+*                args = arguments fournis à l'appel.                          *
+*                                                                             *
+*  Description : Convertit un gestionnaire de recherches en JSON.             *
+*                                                                             *
+*  Retour      : Données textuelles au format JSON ou None en cas d'erreur.   *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_content_scanner_convert_to_json(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Contexte de suivi à renvoyer*/
+    GScanContext *context;                  /* Contexte d'analyse          */
+    int ret;                                /* Bilan de lecture des args.  */
+    GContentScanner *scanner;               /* Encadrement de recherche    */
+    char *out;                              /* Données en sortie           */
+
+#define CONTENT_SCANNER_CONVERT_TO_JSON_METHOD PYTHON_METHOD_DEF            \
+(                                                                           \
+    convert_to_json, "$self, context, /",                                   \
+    METH_VARARGS, py_content_scanner,                                       \
+    "Output a scan results as JSON data.\n"                                 \
+    "\n"                                                                    \
+    "The *context* argument is a pychrysalide.analysis.scan.ScanContext"    \
+    " instance provided by a previous call to *self.analyze()*. This"       \
+    " context stores all the scan results.\n"                               \
+    "\n"                                                                    \
+    "The method returns JSON data as a string value, or *None* in case"     \
+    " of failure."                                                          \
+)
+
+    ret = PyArg_ParseTuple(args, "O&", convert_to_scan_context, &context);
+    if (!ret) return NULL;
+
+    scanner = G_CONTENT_SCANNER(pygobject_get(self));
+
+    out = g_content_scanner_convert_to_json(scanner, context);
+
+    if (out != NULL)
+    {
+        result = PyUnicode_FromString(out);
+        free(out);
+    }
+    else
+    {
+        result = Py_None;
+        Py_INCREF(result);
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
 *  Paramètres  : self    = objet Python concerné par l'appel.                 *
 *                closure = non utilisé ici.                                   *
 *                                                                             *
@@ -247,6 +370,8 @@ PyTypeObject *get_python_content_scanner_type(void)
 {
     static PyMethodDef py_content_scanner_methods[] = {
         CONTENT_SCANNER_ANALYZE_METHOD,
+        CONTENT_SCANNER_CONVERT_TO_TEXT_METHOD,
+        CONTENT_SCANNER_CONVERT_TO_JSON_METHOD,
         { NULL }
     };