LodelContext enhancement to fit the new loader

+ uses the changes in the preload method

lodel/context.py

@@ -193,6 +193,7 @@ submodule : '%s'" % module_fullname)
     def set(cls, site_id):
         if cls._type == cls.MONOSITE:
             raise ContextError("Context cannot be set in MONOSITE beahvior")
+        site_id = LOAD_CTX if site_id is None else site_id
         if not cls.validate_identifier(site_id):
             raise ContextError("Given context name is not a valide identifier \
 : '%s'" % site_id)
@@ -301,8 +302,9 @@ initialize it anymore")
 key '%s'" % alias)
         globs[alias] = obj
         
-    ##@brief Actives a context from a path
+    ##@brief Create a context from a path and returns the context name
     #@param path str : the path from which we extract a sitename
+    #@return the site identifier
     def from_path(cls, path):
         if cls._type != cls.MULTISITE:
             raise ContextError("Cannot create a context from a path in \
@@ -312,6 +314,7 @@ MONOSITE mode")
             raise ContextError(
                 "Unable to create a context named '%s'" % site_id)
         cls.new(site_id)
+        return site_id
 
     ##@brief Delete a site's context
     #@param site_id str : the site's name to remove the context

lodel/plugins/multisite/loader.py

@@ -1,27 +1,37 @@
 # -*- coding: utf-8 -*-
 import os
-from lodel.context import LodelContext
+import os.path
 
-
-def preload():
-    # TODO Get this path dynamically
+try:
+    from lodel.context import LodelContext
+except ImportError:
     LODEL_BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    from lodel.context import LodelContext
 
-    LODEL_INSTANCES_DIR = os.path.join(LODEL_BASE_DIR, 'lodelsites')
+def preload():
+    # TODO Get this path dynamically but should be ./ everytime (we run
+    #the loader from the good folder)
+    LODEL_INSTANCE_DIR = './'
     LodelContext.init(LodelContext.MULTISITE)
     lodelsites_list = [sitename for sitename in os.listdir(LODEL_INSTANCES_DIR) if os.path.isdir(sitename)]
 
     for lodelsite_path in lodelsites_list:
-        LodelContext.from_path(lodelsite_path)
-        lodelcontext = LodelContext._contexts[lodelsite_path.split('/')[-1]]
+        ctx_name = LodelContext.from_path(lodelsite_path)
+        #Switch to new context
+        LodelContext.set(ctx_name)
 
+        os.cwd(lodelsite_path)
         # Loading settings
-        lodelcontext.expose_modules(globals(), {'lodel.settings.settings': [('Settings', 'settings')]})
-        lodelcontext.expose_modules(globals(), {'lodel.settings': ['Settings']})
+        LodelContext.expose_modules(globals(), {'lodel.settings.settings': [('Settings', 'settings')]})
+        if not settings.started():
+            settings('conf.d')
+        LodelContext.expose_modules(globals(), {'lodel.settings': ['Settings']})
 
-        # Loading hooks
+        # Loading hooks & plugins
         LodelContext.expose_modules(globals(), {
             'lodel.plugin': ['LodelHook'],
             'lodel.plugin.core_hooks': 'core_hooks',
             'lodel.plugin.core_scripts': 'core_scripts'
         })
+        #switch back to loader context
+        LodelContext.set(None)