Regroup all code concerning webui in plugins/webui

lodel/interface/web/controllers.py

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-from werkzeug.wrappers import Response
-from lodel.template.loader import TemplateLoader
-
-# This module contains the web UI controllers that will be called from the web ui class
-
-def admin(request):
-    loader = TemplateLoader()
-    response = Response(loader.render_to_response('templates/admin/admin.html'), mimetype='text/html')
-    response.status_code = 200
-    return response
-
-
-def index(request):
-    loader = TemplateLoader()
-    response = Response(loader.render_to_response('templates/index/index.html'), mimetype='text/html')
-    response.status_code = 200
-    return response
-
-
-def not_found(request):
-    loader = TemplateLoader()
-    response = Response(loader.render_to_response('templates/errors/404.html'), mimetype='text/html')
-    response.status_code = 404
-    return response
-
-
-def test(request):
-    loader = TemplateLoader()
-    response = Response(loader.render_to_response('templates/test.html'), mimetype='text/html')
-    response.status_code = 200
-    return response

plugins/webui/interface/controllers.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+import os.path
+
+from werkzeug.wrappers import Response
+from .template.loader import TemplateLoader
+
+# This module contains the web UI controllers that will be called from the web ui class
+
+def get_response(tpl, mimetype = 'text/html', status_code = 200):
+    loader = TemplateLoader()
+    response = Response(    loader.render_to_response(tpl),
+                            mimetype = 'text/html')
+    response.status_code = status_code
+    return response
+
+def admin(request):
+    return get_response('admin/admin.html')
+
+def index(request):
+    return get_response('index/index.html')
+
+def not_found(request):
+    return get_response('errors/404.html', status_code = 404)
+
+def test(request):
+    return get_response('test.html')

plugins/webui/interface/router.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 import re
 
-from lodel.interface.web.controllers import *
-import lodel.interface.web.urls as main_urls
+from .controllers import *
+from .urls import urls
 
 
 def get_controller(request):
     url_rules = []
-    for url in main_urls.urls:
+    for url in urls:
         url_rules.append((url[0], url[1]))
 
     # Returning the right controller to call
@@ -17,4 +17,4 @@ def get_controller(request):
             request.url_args = match.groups()
             return callback
 
-    return not_found
+    return not_found

plugins/webui/interface/template/loader.py

@@ -3,9 +3,11 @@ import jinja2
 import os
 
 import settings
-from lodel.template.api import api_lodel_templates
-from lodel.template.exceptions.not_allowed_custom_api_key_error import NotAllowedCustomAPIKeyError
+from .api import api_lodel_templates
+from .exceptions.not_allowed_custom_api_key_error import NotAllowedCustomAPIKeyError
 
+from ...main import PLUGIN_PATH
+TEMPLATE_PATH = os.path.realpath(os.path.join(PLUGIN_PATH, 'templates/'))
 
 class TemplateLoader(object):
 
@@ -18,7 +20,7 @@ class TemplateLoader(object):
     # @param follow_links bool : indicates whether or not to follow the symbolic links (default: True)
     # @param is_cache_active bool : indicates whether or not the cache should be activated or not (default: True)
     # @todo connect this to the new settings system
-    def __init__(self, search_path=settings.base_path, follow_links=True, is_cache_active=True):
+    def __init__(self, search_path=TEMPLATE_PATH, follow_links=True, is_cache_active=True):
         self.search_path = search_path
         self.follow_links = follow_links
         self.is_cache_active = is_cache_active

plugins/webui/interface/urls.py

@@ -1,4 +1,4 @@
-from lodel.interface.web.controllers import *
+from .controllers import *
 
 urls = (
     (r'^$', index),
@@ -6,4 +6,4 @@ urls = (
     (r'admin/(.+)$', admin),
     (r'test/(.+)$', test),
     (r'test/?$', test)
-)
+)

plugins/webui/main.py

@@ -1,14 +1,16 @@
 #-*- coding: utf-8 -*-
 
-import os
+import os, os.path
 from lodel.plugin import LodelHook
 from lodel.settings import Settings
 
+PLUGIN_PATH = os.path.dirname(__file__)
+
 ##@brief uwsgi startup demo
 @LodelHook('lodel2_loader_main')
 def uwsgi_fork(hook_name, caller, payload):
     if Settings.webui.standalone:
-        cmd='uwsgi_python3 --http-socket {addr}:{port} --module run'
+        cmd='uwsgi_python3 --http-socket {addr}:{port} --module plugins.webui.run'
         cmd = cmd.format(
                     addr = Settings.webui.listen_address,
                     port = Settings.webui.listen_port)

plugins/webui/run.py

@@ -5,8 +5,8 @@ import os
 from werkzeug.contrib.sessions import FilesystemSessionStore
 
 from lodel.settings import Settings
-from lodel.interface.web.router import get_controller
-from lodel.interface.web.lodelrequest import LodelRequest
+from .interface.router import get_controller
+from .interface.lodelrequest import LodelRequest
 from lodel.utils.datetime import get_utc_timestamp
 
 SESSION_FILES_BASE_DIR = Settings.webui.sessions.directory

plugins/webui/templates/admin/admin.html

@@ -0,0 +1,3 @@
+{% extends "base_backend.html" %}
+{% block title %}Lodel 2 - ADMIN{% endblock %}
+{% block content %}ADMIN{% endblock %}

plugins/webui/templates/index/index.html

@@ -0,0 +1,3 @@
+{% extends "base.html" %}
+{% block title %}Lodel 2 - DASHBOARD{% endblock %}
+{% block content %}DASHBOARD{% endblock %}

scripts/create_instance.sh

@@ -37,7 +37,6 @@ cp -Rv $libdir/install/conf.d $instdir/
 cp -Rv $libdir/install/loader.py $instdir/
 cp -Rv $libdir/install/editorial_model.pickle $instdir/
 ln -sv $libdir/install/Makefile $instdir/Makefile
-ln -sv $libdir/install/run.py $instdir/run.py
 ln -sv $libdir/install/lodel_admin.py $instdir/lodel_admin.py
 ln -sv $libdir/plugins $instdir/plugins
 

templates/admin/admin.html

@@ -1,3 +0,0 @@
-{% extends "templates/base_backend.html" %}
-{% block title %}Lodel 2 - ADMIN{% endblock %}
-{% block content %}ADMIN{% endblock %}

templates/index/index.html

@@ -1,3 +0,0 @@
-{% extends "templates/base.html" %}
-{% block title %}Lodel 2 - DASHBOARD{% endblock %}
-{% block content %}DASHBOARD{% endblock %}