Merge pull request #40 from CESNET/devel

* Finalize logic config.json files for modules and bootstrapping
* Change default DB provider to SQLite3

Author: petrstehlik

backend/config-sample.ini

@@ -48,7 +48,7 @@ ssl = false
 ;	mysql:	server, port and database must be specified, user and password
 ;			are for authentication to the db
 ;	mongodb: server, port and database must be set
-provider = mongodb
+provider = sqlite
 users = users
 configuration = configuration
 

bootstrap.py

@@ -4,6 +4,7 @@
 import os
 import re
 import logging
+import fnmatch
 import glob
 
 logging.basicConfig()
@@ -48,6 +49,19 @@ def dicts(dst, add):
             dst[key] = add[key]
         return conflicts
 
+def recursive_glob(rootdir='.', pattern='*'):
+	"""Search recursively for files matching a specified pattern.
+	Adapted from http://stackoverflow.com/questions/2186525/use-a-glob-to-find-files-recursively-in-python
+	"""
+
+	matches = []
+	for root, dirnames, filenames in os.walk(rootdir):
+	  for filename in fnmatch.filter(filenames, pattern):
+		  matches.append(os.path.join(root, filename))
+
+	return matches
+
+
 def mergeNpmDeps(base, module, modulename):
     """
     Adds dependencies from module into base and reports any conflicts that happen.
@@ -169,63 +183,76 @@ def updateModuleList(moduleList, config, modulename):
     return True
 
 def createSymlink(src, dst):
+    log.debug("Symlinking src: %s, dst: %s" % (src, dst))
     try:
         # Using lexists to detect and remove broken symlinks as well as removing symlinks that
         # will be overwritten.
         if os.path.lexists(dst):
             os.remove(dst)
         os.symlink(src, dst)
     except (OSError, IOError) as e: # Insufficient privileges
-        log.warn(str(e))
+        log.warn("Cannot create symlink (target: %s) %s" % (src, str(e)))
 
 def bootstrapModules(basedeps, moduleList):
     """
     Build moduleList, update basedeps with module specific dependencies and create symlinks into
     module folders of both backend and frontend.
     """
     #modules = getImmediateSubdirs('modules')
-    cfgfiles = glob.glob(os.path.join(BASE_PATH, 'modules', '*.config.json'))
-    for cfgpath in cfgfiles:
-        #cfgpath = os.path.join(BASE_PATH, 'modules', module, 'config.json')
-
-        config = None
+    cfgfiles = glob.glob(os.path.join(BASE_PATH, 'modules', '*/*config.json'))
 
+    for cfgpath in cfgfiles:
         try:
-            with open(cfgpath, 'r') as fh:
-                config = json.load(fh)
-        except (OSError, IOError):
-            log.warn(module + ': Cannot find ' + cfgpath + ', skipping module')
-            continue
+            config = None
+
+            try:
+                with open(cfgpath, 'r') as fh:
+                    config = json.load(fh)
+            except (OSError, IOError):
+                log.warn(module + ': Cannot find ' + cfgpath + ', skipping module')
+                continue
+
+            try:
+                name = config['module']['name']
+            except KeyError as e:
+                log.warn("Cannot find name in module, skipping config %s" % cfgpath)
+
+            if not updateModuleList(moduleList, config, name):
+                continue
+
+            module_dir = os.path.dirname(cfgpath)
+
+            # Module might not have dependencies, their absence is not an error
+            if 'dependencies' in config:
+                updateDeps(basedeps, config['dependencies'], name)
+
+            if 'backend' in config['module']:
+                src = os.path.join(module_dir, config['module']['backend'])
+                dst = os.path.join(BASE_PATH, 'backend/liberouterapi/modules', name)
+                createSymlink(src, dst)
+
+            if 'assets' in config['module']:
+                """
+                Link assets for frontend to frontend/src/assets folder
+                Each module must contain key 'name' and 'assets', after importing assets are available
+                via /name/ path on frontend
+                """
+                if not 'name' in config['module']:
+                    log.warn("No 'name' specified, skipping inclusion of assets.")
+                    break
+                src = os.path.join(module_dir, config['module']['assets'])
+                dst = os.path.join(BASE_PATH, 'frontend/src/assets', name)
+                createSymlink(src, dst)
+
+            # Frontend key presence tested by updateModuleList
+            src = os.path.join(module_dir, config['module']['frontend'])
+            dst = os.path.join(BASE_PATH, 'frontend/src/app/modules', name)
 
-        if not updateModuleList(moduleList, config, config['name']):
-            continue
-
-        # Module might not have dependencies, their absence is not an error
-        if 'dependencies' in config:
-            updateDeps(basedeps, config['dependencies'], config['name'])
-
-        if 'backend' in config['module']:
-            src = os.path.join(BASE_PATH, 'modules', config['module']['backend'])
-            dst = os.path.join(BASE_PATH, 'backend/liberouterapi/modules', config['name'])
             createSymlink(src, dst)
-
-        if 'assets' in config['module']:
-            """
-            Link assets for frontend to frontend/src/assets folder
-            Each module must contain key 'name' and 'assets', after importing assets are available
-            via /name/ path on frontend
-            """
-            if not 'name' in config['module']:
-                log.warn("No 'name' specified, skipping inclusion of assets.")
-                break
-            src = os.path.join(BASE_PATH, 'modules', config['name'], config['module']['assets'])
-            dst = os.path.join(BASE_PATH, 'frontend/src/assets', config['module']['name'])
-            createSymlink(src, dst)
-
-        # Frontend key presence tested by updateModuleList
-        src = os.path.join(BASE_PATH, 'modules', config['name'], config['module']['frontend'])
-        dst = os.path.join(BASE_PATH, 'frontend/src/app/modules', config['name'])
-        createSymlink(src, dst)
+        except Exception as e:
+            log.warn("Skipping configuration in {0}. Reason: {1} ({2})"
+                    .format(cfgpath, str(e), type(e)))
+            continue
 
 def registerModules(modules):
     """

modules/example/backend/config.json

@@ -1,5 +1,4 @@
 {
-    "name" : "example",
     "dependencies": {
         "npm": "frontend/package.json",
         "ngc": "frontend/.angular-cli.json",
@@ -9,6 +8,7 @@
         "class": "ExampleModule",
         "file": "frontend/example.module.ts",
         "frontend": "frontend/",
-        "backend": "backend/"
+        "backend": "backend/",
+        "name" : "example"
     }
 }