yannweb/lodel2_mirror
1
0
Fork 0
mirror of https://github.com/yweber/lodel2.git synced 2026-03-22 11:02:02 +01:00
Code Releases Activity

Bugfix and better implementation of _LeCrud.check_datas_value()

Browse source
This commit is contained in:
Yann 2015-11-25 17:00:08 +01:00
commit d44d86cb79
1 changed files with 19 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

48
leapi/lecrud.py
View file

@ -106,39 +106,29 @@ class _LeCrud(object):
@classmethod
def check_datas_value(cls, datas, complete = False, allow_internal = True):
err_l = [] #Stores errors
excepted = set()
internal = set() #Only used if not allow_internal
if not allow_internal:
internal = list()
excepted = list()
for ftn, ftt in cls.fieldtypes().items():
if ftt.is_internal():
internal.append(ftn)
else:
excepted.append(ftn)
excepted = set(excepted)
internal = set(internal)
else:
excepted = set( cls.fieldtypes().keys() )
correct = [] #Valid fields name
mandatory = [] #mandatory fields name
for fname, ftt in cls.fieldtypes().items():
if allow_internal and not ftt.is_internal():
correct.append(fname)
if complete and not hasattr(ftt, 'default'):
mandatory.append(fname)
mandatory = set(mandatory)
correct = set(correct)
provided = set(datas.keys())
#Searching unknown fields
unknown = provided - (excepted | internal)
#searching unknow fields
unknown = provided - correct
for u_f in unknown:
err_l.append(AttributeError("Unknown field '%s'"%u_f))
#Checks for missing fields
if complete:
missings = excepted - provided
for miss_field in missings:
err_l.append(AttributeError("The data for field '%s' is missing"%miss_field))
#Checks for internal fields if not allowe
if not allow_internal:
wrong_internal = provided & internal
for wint in wrong_internal:
err_l.append(AttributeError("A value was provided for the field '%s' but it is marked as internal"%wint))
#Datas check
#here we can check if the field is unknown or rejected because it is internal
err_l.append(AttributeError("Unknown or unauthorized field '%s'"%u_f))
#searching missings fields
missings = mandatory - provided
for miss_field in missings:
err_l.append(AttributeError("The data for field '%s' is missing"%miss_field))
#Checks datas
checked_datas = dict()
for name, value in [ (name, value) for name, value in datas.items() if name in (excepted | internal) ]:
for name, value in [ (name, value) for name, value in datas.items() if name in correct ]:
checked_datas[name], err = cls.fieldtypes()[name].check_data_value(value)
if err:
err_l.append(err)