small server enhancement (add tools in it) + add simple lightbox sample

3 files changed, 14 insertions, 6 deletions

diff --git a/lib/server/__init__.py b/lib/server/__init__.py
index a779594..06b0b1d 100644
--- a/lib/server/__init__.py
+++ b/lib/server/__init__.py
@@ -1,2 +1,4 @@
 # server import
 from server._server import Server
+# ..
+from server.flask import BUNDLE, ROOT
diff --git a/lib/server/flask/__init__.py b/lib/server/flask/__init__.py
index 7d75791..f079068 100644
--- a/lib/server/flask/__init__.py
+++ b/lib/server/flask/__init__.py
@@ -2,4 +2,4 @@
 from flask import request, jsonify
 
 # server import
-from server.flask._app import logger, app, render, run_app
+from server.flask._app import logger, app, render, run_app, BUNDLE, ROOT
diff --git a/lib/server/flask/_app.py b/lib/server/flask/_app.py
index cb2d4c3..bc6f3b3 100644
--- a/lib/server/flask/_app.py
+++ b/lib/server/flask/_app.py
@@ -15,23 +15,29 @@ APP_NAME = 'my_activity' if APP_NAME is None else APP_NAME
 _debug = config.Config().get('server>debug')
 _key = config.Config().get('server>secret_key')
 
-# our activity root directory relative to the current one
-PROJET_ROOT =  os.path.join(os.path.dirname(__file__), '..', '..', '..')
-
 # flask import
 import flask
 
+# sugar or debug root path factory
+try:
+    from sugar.activity import activity
+    BUNDLE = activity.get_bundle_path()
+    ROOT   = activity.get_bundle_path()
+except Exception, e:
+    BUNDLE = '.'
+    ROOT   = '.'
+
 # init app
 app = flask.Flask(__name__)
 app.debug = True if _debug is None else _debug
 app.secret_key = 'NO_KEY_OOPS' if _key is None else _key
 # override jinja template path
-app.jinja_loader.searchpath = [os.path.join(PROJET_ROOT, 'templates')]
+app.jinja_loader.searchpath = [os.path.join(BUNDLE, 'templates')]
 
 # init static folder path
 from werkzeug import SharedDataMiddleware
 app.wsgi_app = SharedDataMiddleware(app.wsgi_app,
-        {'/static': os.path.join(PROJET_ROOT, 'static')})
+        {'/static': os.path.join(BUNDLE, 'static')})
 
 # set basic logging out of sugar
 try: