Created the GLoadedContent interface to load all kinds of content.

6 files changed, 195 insertions, 3 deletions

diff --git a/plugins/pychrysa/analysis/Makefile.am b/plugins/pychrysa/analysis/Makefile.am
index 31d37f6..c1639e7 100644
--- a/plugins/pychrysa/analysis/Makefile.am
+++ b/plugins/pychrysa/analysis/Makefile.am
@@ -5,6 +5,7 @@ libpychrysaanalysis_la_SOURCES =		\
 	binary.h binary.c					\
 	block.h block.c						\
 	content.h content.c					\
+	loaded.h loaded.c					\
 	module.h module.c					\
 	routine.h routine.c
 
diff --git a/plugins/pychrysa/analysis/content.c b/plugins/pychrysa/analysis/content.c
index 95f88f6..1f36eb8 100644
--- a/plugins/pychrysa/analysis/content.c
+++ b/plugins/pychrysa/analysis/content.c
@@ -416,7 +416,7 @@ PyTypeObject *get_python_binary_content_type(void)
 
         PyVarObject_HEAD_INIT(NULL, 0)
 
-        .tp_name        = "pychrysalide.analysis.contents.BinContent",
+        .tp_name        = "pychrysalide.analysis.BinContent",
         .tp_basicsize   = sizeof(PyObject),
 
         .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
@@ -437,7 +437,7 @@ PyTypeObject *get_python_binary_content_type(void)
 *                                                                             *
 *  Paramètres  : module = module dont la définition est à compléter.          *
 *                                                                             *
-*  Description : Prend en charge l'objet 'pychrysalide.glibext.BinContent'.   *
+*  Description : Prend en charge l'objet 'pychrysalide.analysis.BinContent'.  *
 *                                                                             *
 *  Retour      : Bilan de l'opération.                                        *
 *                                                                             *
diff --git a/plugins/pychrysa/analysis/content.h b/plugins/pychrysa/analysis/content.h
index 691d901..da1b9be 100644
--- a/plugins/pychrysa/analysis/content.h
+++ b/plugins/pychrysa/analysis/content.h
@@ -34,7 +34,7 @@
 /* Fournit un accès à une définition de type à diffuser. */
 PyTypeObject *get_python_binary_content_type(void);
 
-/* Prend en charge l'objet 'pychrysalide.glibext.BinContent'. */
+/* Prend en charge l'objet 'pychrysalide.analysis.BinContent'. */
 bool register_python_binary_content(PyObject *);
 
 
diff --git a/plugins/pychrysa/analysis/loaded.c b/plugins/pychrysa/analysis/loaded.c
new file mode 100644
index 0000000..b38025a
--- /dev/null
+++ b/plugins/pychrysa/analysis/loaded.c
@@ -0,0 +1,146 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * loaded.c - prototypes pour l'équivalent Python du fichier "analysis/loaded.c"
+ *
+ * Copyright (C) 2017 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide 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
+ */
+
+
+#include "loaded.h"
+
+
+#include <assert.h>
+#include <pygobject.h>
+
+
+#include <i18n.h>
+
+
+#include <analysis/loaded.h>
+
+
+
+/* Détermine le nombre de vues disponibles pour un contenu. */
+static PyObject *py_loaded_content_count_views(PyObject *, PyObject *);
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = contenu chargé à manipuler.                           *
+*                args = non utilisé ici.                                      *
+*                                                                             *
+*  Description : Détermine le nombre de vues disponibles pour un contenu.     *
+*                                                                             *
+*  Retour      : Quantité strictement positive.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_loaded_content_count_views(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    GLoadedContent *content;                /* Version GLib du format      */
+    size_t count;                           /* Quantité à retourner        */
+
+    content = G_LOADED_CONTENT(pygobject_get(self));
+
+    count = g_loaded_content_count_views(content);
+
+    result = PyLong_FromUnsignedLongLong(count);
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : -                                                            *
+*                                                                             *
+*  Description : Fournit un accès à une définition de type à diffuser.        *
+*                                                                             *
+*  Retour      : Définition d'objet pour Python.                              *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyTypeObject *get_python_loaded_content_type(void)
+{
+    static PyMethodDef py_loaded_content_methods[] = {
+        {
+            "count_views", py_loaded_content_count_views,
+            METH_NOARGS,
+            "count_views($self, /)\n--\n\nCompute the quantity of available views."
+        },
+        { NULL }
+    };
+
+    static PyGetSetDef py_loaded_content_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_loaded_content_type = {
+
+        PyVarObject_HEAD_INIT(NULL, 0)
+
+        .tp_name        = "pychrysalide.analysis.LoadedContent",
+        .tp_basicsize   = sizeof(PyObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide loaded content",
+
+        .tp_methods     = py_loaded_content_methods,
+        .tp_getset      = py_loaded_content_getseters
+
+    };
+
+    return &py_loaded_content_type;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.....LoadedContent'.    *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_loaded_content(PyObject *module)
+{
+    PyTypeObject *py_loaded_content_type;   /* Type Python 'LoadedContent' */
+    PyObject *dict;                         /* Dictionnaire du module      */
+
+    py_loaded_content_type = get_python_loaded_content_type();
+
+    dict = PyModule_GetDict(module);
+    pyg_register_interface(dict, "LoadedContent", G_TYPE_LOADED_CONTENT, py_loaded_content_type);
+
+    return true;
+
+}
diff --git a/plugins/pychrysa/analysis/loaded.h b/plugins/pychrysa/analysis/loaded.h
new file mode 100644
index 0000000..3238202
--- /dev/null
+++ b/plugins/pychrysa/analysis/loaded.h
@@ -0,0 +1,42 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * loaded.h - prototypes pour l'équivalent Python du fichier "analysis/loaded.h"
+ *
+ * Copyright (C) 2017 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide 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
+ */
+
+
+#ifndef _PLUGINS_PYCHRYSA_ANALYSIS_LOADED_H
+#define _PLUGINS_PYCHRYSA_ANALYSIS_LOADED_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_loaded_content_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.analysis.LoadedContent'. */
+bool register_python_loaded_content(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_CONTENT_H */
diff --git a/plugins/pychrysa/analysis/module.c b/plugins/pychrysa/analysis/module.c
index 253fe76..f4a0f5b 100644
--- a/plugins/pychrysa/analysis/module.c
+++ b/plugins/pychrysa/analysis/module.c
@@ -31,6 +31,7 @@
 #include "binary.h"
 #include "block.h"
 #include "content.h"
+#include "loaded.h"
 #include "routine.h"
 #include "contents/module.h"
 #include "db/module.h"
@@ -84,6 +85,8 @@ bool add_analysis_module_to_python_module(PyObject *super)
 
     result = true;
 
+    result &= register_python_loaded_content(module);
+
     result &= register_python_loaded_binary(module);
     result &= register_python_instr_block(module);
     //result &= register_python_binary_content(module);