From f8b9a90de7fd20448d24385cbbc936bfca59bfb9 Mon Sep 17 00:00:00 2001
From: Sebastian Lobinger <sebastian.lobinger@zib.de>
Date: Wed, 26 Jul 2017 13:29:39 +0200
Subject: [PATCH] make use of alias feature #29 in ExampleApp
---
ExampleApp/__init__.py | 8 ++++++--
ExampleApp/config/config.yaml | 5 +++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ExampleApp/__init__.py b/ExampleApp/__init__.py
index 4e6336a..18bc6c0 100644
--- a/ExampleApp/__init__.py
+++ b/ExampleApp/__init__.py
@@ -7,7 +7,9 @@ def create_hub():
hubConf = yaml.load(f.read())
hub = SAMSHub(name= __name__, config=hubConf['exampleApp'])
hub.flaskApp.config.update(hubConf.get('flask', {}))
- for appName in hubConf['apps']:
+ for appEntry in hubConf['apps']:
+ appName = appEntry['name']
+ appAlias = appEntry.get('alias')
with open(appName.replace('.', '/') + '/manifest.yaml') as f:
manifest = yaml.load(f.read())
langDict = {'en': {}}
@@ -16,7 +18,9 @@ def create_hub():
singleLang = yaml.load(f.read())
langDict.update(
{os.path.splitext(os.path.basename(yaml_file))[0]: singleLang})
- hub.addApp(SAMSApp(name = appName, manifest = manifest, langDict = langDict))
+ hub.addApp(
+ SAMSApp(name = appName, manifest = manifest, langDict = langDict),
+ alias = appAlias)
return hub
def search_yaml_files(path, exts = ['.yaml', '.yml']):
diff --git a/ExampleApp/config/config.yaml b/ExampleApp/config/config.yaml
index 5ee69e5..de8d3a2 100644
--- a/ExampleApp/config/config.yaml
+++ b/ExampleApp/config/config.yaml
@@ -5,5 +5,6 @@ exampleApp:
default_language: de
main_app: 'ExampleApp.Main'
apps:
- - 'ExampleApp.Main'
- - 'ExampleApp.Extra'
\ No newline at end of file
+ - name: 'ExampleApp.Main'
+ - name: 'ExampleApp.Extra'
+ alias: 'Extra'
\ No newline at end of file
--
GitLab