nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewriting of ResultsCondition, first part

Browse source 
Allow to give int, float, and not only strings
Fix AND/OR conditions
Add some comments to unterstand this fucking code
This commit is contained in:
Florent 2013-08-05 17:06:16 +02:00
commit 31016c4846
1 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
weboob/tools/application/results.py
View file

@ -27,14 +27,14 @@ __all__ = ['ResultsCondition', 'ResultsConditionError']
class ResultsCondition(IResultsCondition): class ResultsCondition(IResultsCondition):
condition_str = None condition_str = None
# TODO: NOT?
def __init__(self, condition_str): def __init__(self, condition_str):
condition_str = condition_str.replace(' OR ', ' or ') \ condition_str = condition_str.replace(' NOT ', ' not ')
.replace(' AND ', ' and ') \
.replace(' NOT ', ' not ')
or_list = [] or_list = []
for _or in condition_str.split(' or '): for _or in condition_str.split(' OR '):
and_dict = {} and_dict = {}
for _and in _or.split(' and '): for _and in _or.split(' AND '):
if '!=' in _and: if '!=' in _and:
k, v = _and.split('!=') k, v = _and.split('!=')
k = k.strip() + '!' k = k.strip() + '!'
@ -47,24 +47,35 @@ class ResultsCondition(IResultsCondition):
self.condition = or_list self.condition = or_list
self.condition_str = condition_str self.condition_str = condition_str
def is_valid(self, obj): def is_valid(self, obj):
d = dict(obj.iter_fields()) d = dict(obj.iter_fields())
# A and B give us a list with one elements of two dicts ([{u'A': u'toto', u'B': u'charles'}]
# A or B give us a list with two elements of one dict [{u'A': u'toto'}, {u'B': u'charles'}]
# We have to return True if one element of the list is True, and to evaluate all dicts at each iteration
for _or in self.condition: for _or in self.condition:
myeval = True
for k, v in _or.iteritems(): for k, v in _or.iteritems():
different = False
if k.endswith('!'): if k.endswith('!'):
k = k[:-1] k = k[:-1]
different = True different = True
else:
different = False
if k in d: if k in d:
if different: # We have to change the type of v, always gived as string by application
if d[k] != v: typed = type(d[k])
return True try:
else: myeval = (d[k] == typed(v)) != different
if d[k] == v: except:
return True myeval = False
else: else:
raise ResultsConditionError(u'Field "%s" is not valid.' % k) raise ResultsConditionError(u'Field "%s" is not valid.' % k)
# Do not try all AND conditions if one is false
if not myeval:
break
# Return True at the first OR valid condition
if myeval:
return True
# If we are here, all OR conditions are False
return False return False
def __str__(self): def __str__(self):