0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

support nested & conditions

Browse source
This commit is contained in:
j 2018-11-14 15:36:37 +00:00
parent b56fdeea72
commit 99e4591337
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pandora/clip/managers.py
View file

@ -126,6 +126,15 @@ def parseConditions(conditions, operator, user):
return conn return conn
return None return None
def flatten_conditions(conditions):
conditions_ = []
for c in conditions:
if 'conditions' in c:
conditions_ += flatten_conditions(c['conditions'])
else:
conditions_.append(c)
return conditions_
class ClipManager(Manager): class ClipManager(Manager):
def get_query_set(self): def get_query_set(self):
@ -135,7 +144,8 @@ class ClipManager(Manager):
layer_ids = [k['id'] for k in settings.CONFIG['layers']] layer_ids = [k['id'] for k in settings.CONFIG['layers']]
keys = layer_ids + ['annotations', 'text', '*'] keys = layer_ids + ['annotations', 'text', '*']
conditions = data.get('query', {}).get('conditions', []) conditions = data.get('query', {}).get('conditions', [])
conditions = list(filter(lambda c: c['key'] in keys, conditions)) conditions = flatten_conditions(conditions)
conditions = list(filter(lambda c: c.get('key') in keys, conditions))
operator = data.get('query', {}).get('operator', '&') operator = data.get('query', {}).get('operator', '&')
def parse(condition): def parse(condition):