archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Collections in extension eve_settings now should start with the ext name.

Browse Source 
Instead of Pillar automagically prepending 'attract.' or 'flamenco.' to the
names this should now be done explicitly in the extension's Eve settings.
This allows for more explicit configuration, and ensures foreign key
definitions are unambiguous.
This commit is contained in:
Sybren A. Stüvel
2016-12-14 11:26:28 +01:00
parent 11197e669c
commit a100d73a8b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pillar/__init__.py
View File

@@ -225,11 +225,14 @@ class PillarServer(Eve):
eve_settings = pillar_extension.eve_settings() eve_settings = pillar_extension.eve_settings()
if 'DOMAIN' in eve_settings: if 'DOMAIN' in eve_settings:
pillar_ext_prefix = pillar_extension.name + '.'
for key, collection in eve_settings['DOMAIN'].items(): for key, collection in eve_settings['DOMAIN'].items():
source = '%s.%s' % (pillar_extension.name, key) assert key.startswith(pillar_ext_prefix), \
url = '%s/%s' % (pillar_extension.name, key) 'Eve collection names of %s MUST start with %r' % \
(pillar_extension.name, pillar_ext_prefix)
url = key.replace('.', '/')
collection.setdefault('datasource', {}).setdefault('source', source) collection.setdefault('datasource', {}).setdefault('source', key)
collection.setdefault('url', url) collection.setdefault('url', url)
self.config['DOMAIN'].update(eve_settings['DOMAIN']) self.config['DOMAIN'].update(eve_settings['DOMAIN'])