Deleted datasources plugins and add a settings for datasources declaration

- now datasources are declared with two conf keys : read_only and identifier
- the old datasources plugin hook is now declared in lodel/plugin/core_hooks.py. This file is imported after lodel/plugin/hooks.py in the loader.py

install/loader.py

@@ -22,10 +22,9 @@ from lodel.settings.settings import Settings as settings
 settings('conf.d')
 from lodel.settings import Settings
 
-
-
-
+#Starts hooks
 from lodel.plugin import LodelHook
+from lodel.plugin import core_hooks
 
 def start():
     #Load plugins

plugins/datasources/main.py → lodel/plugin/core_hooks.py

@@ -4,6 +4,8 @@ from lodel.plugin import LodelHook
 from lodel.settings import Settings
 from lodel import logger
 
+##@package lodel.plugin.core_hooks
+#@brief Lodel2 internal hooks declaration
 
 ##@brief Bootstrap hook to check datasources configuration
 @LodelHook('lodel2_bootstraped')

lodel/plugin/hooks.py

@@ -83,3 +83,4 @@ class LodelHook(object):
     @classmethod
     def __reset__(cls):
         cls._hooks = dict()
+

lodel/plugin/plugins.py

@@ -73,8 +73,8 @@ class Plugin(object):
         try:
             loader = SourceFileLoader(plugin_module, init_source)
             self.module = loader.load_module()
-        except ImportError as e:
-             raise PluginError("Failed to load plugin '%s'. It seems that the plugin name is not valid" % plugin_name)
+        except (ImportError,FileNotFoundError) as e:
+             raise PluginError("Failed to load plugin '%s'. It seems that the plugin name is not valid or the plugin do not exists" % plugin_name)
 
         # loading confspecs
         try:

lodel/settings/validator.py

@@ -322,15 +322,13 @@ LODEL2_CONF_SPECS = {
                         SettingValidator('int', none_is_valid = True)),
     },
     'lodel2.editorialmodel': {
-        'emfile': ( 'em.pickle',
-                    SettingValidator('strip')),
-        'emtranslator': (   'picklefile',
-                            SettingValidator('strip')),
-        'dyncode': (    'leapi_dyncode.py',
-                        SettingValidator('strip')),
-        'groups': ( '',
-                    SettingValidator('list')),
-        'editormode': ( False,
-                        SettingValidator('bool')),
+        'emfile': ( 'em.pickle', SettingValidator('strip')),
+        'emtranslator': ( 'picklefile', SettingValidator('strip')),
+        'dyncode': ( 'leapi_dyncode.py', SettingValidator('strip')),
+        'groups': ( '', SettingValidator('list')),
+        'editormode': ( False, SettingValidator('bool')),
     },
+    'lodel2.datasources.*': {
+        'read_only': (True, SettingValidator('bool')),
+        'identifier': ( None, SettingValidator('string'))}
 }

plugins/datasources/__init__.py

@@ -1,8 +0,0 @@
-from lodel.settings.validator import SettingValidator
-
-__loader__ = 'main.py'
-
-CONFSPEC = {
-                'lodel2.datasources.*': {
-                        'identifier': ( None,
-                                        SettingValidator('string'))}}

plugins/dummy_datasource/__init__.py

@@ -2,7 +2,7 @@ from lodel.settings.validator import SettingValidator
 from .main import DummyDatasource as Datasource
 
 __loader__ = 'main.py'
-__plugin_deps__ = ['datasources']
+__plugin_deps__ = []
 
 CONFSPEC = {
     'lodel2.datasource.dummy_datasource.*' : {

plugins/dummy_datasource/main.py

@@ -21,31 +21,33 @@ class DummyDatasource(object):
                instanciate=True):
         pass
 
-    ## @brief Deletes one record defined by its uid
-    # @param target_cls Emclass : class of the record to delete
-    # @param uid dict|list : a dictionary of fields and values composing the unique identifier of the record or a list of several dictionaries
-    # @return int : number of deleted records
-    def delete(self, target_cls, uid):
+    ##@brief Deletes records according to given filters
+    #@param target Emclass : class of the record to delete
+    #@param filters list : List of filters
+    #@param relational_filters list : List of relational filters
+    #@return int : number of deleted records
+    def delete(self, target, filters, relational_filters):
         pass
 
-    ## @brief updates one or a list of records
-    # @param target_cls Emclass : class of the object to insert
-    # @param uids list : list of uids to update
-    # @param datas dict : datas to update (new values)
-    # @return int : Number of updated records
-    def update(self, target_cls, uids, **datas):
+    ## @brief updates records according to given filters
+    #@param target Emclass : class of the object to insert
+    #@param filters list : List of filters
+    #@param rel_filters list : List of relational filters
+    #@param upd_datas dict : datas to update (new values)
+    #@return int : Number of updated records
+    def update(self, target, filters, relational_filters, upd_datas):
         pass
 
     ## @brief Inserts a record in a given collection
-    # @param target_cls Emclass : class of the object to insert
-    # @param datas dict : datas to insert
-    # @return bool
-    def insert(self, target_cls, **datas):
+    # @param target Emclass : class of the object to insert
+    # @param new_datas dict : datas to insert
+    # @return the inserted uid
+    def insert(self, target, new_datas):
         pass
 
     ## @brief Inserts a list of records in a given collection
-    # @param target_cls Emclass : class of the objects inserted
-    # @param datas_list
+    # @param target Emclass : class of the objects inserted
+    # @param datas_list list : list of dict
     # @return list : list of the inserted records' ids
-    def insert_multi(self, target_cls, datas_list):
+    def insert_multi(self, target, datas_list):
         pass

plugins/mongodb_datasource/main.py

@@ -126,7 +126,7 @@ class MongoDbDatasource(object):
 
         return results
 
-    ##@brief Deletes one record defined by its uid
+    ##@brief Deletes records according to given filters
     #@param target Emclass : class of the record to delete
     #@param filters list : List of filters
     #@param relational_filters list : List of relational filters
@@ -137,7 +137,7 @@ class MongoDbDatasource(object):
         res = self.__collection(target).delete_many(mongo_filters)
         return res.deleted_count
 
-    ## @brief updates one or a list of records
+    ## @brief updates records according to given filters
     #@param target Emclass : class of the object to insert
     #@param filters list : List of filters
     #@param rel_filters list : List of relational filters

tests/tests_conf.d/lodel2.ini

@@ -2,7 +2,7 @@
 debug = False
 sitename = noname
 plugins_path = /foo/plugins
-plugins = dummy, datasources, dummy_datasource
+plugins = dummy, dummy_datasource
 
 [lodel2.logging.stderr]
 level = Error