Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Support register to smo with https/tls protocol.
[pti/o2.git]
/
o2common
/
views
/
route.py
diff --git
a/o2common/views/route.py
b/o2common/views/route.py
index
b2d537d
..
2c93d77
100644
(file)
--- a/
o2common/views/route.py
+++ b/
o2common/views/route.py
@@
-95,7
+95,7
@@
class o2_marshal_with(marshal_with):
resp = f(*args, **kwargs)
req_args = request.args
resp = f(*args, **kwargs)
req_args = request.args
- mask = self._gen_mask_from_
filte
r(**req_args)
+ mask = self._gen_mask_from_
selecto
r(**req_args)
# mask = self.mask
# mask = self.mask
@@
-124,7
+124,7
@@
class o2_marshal_with(marshal_with):
return wrapper
return wrapper
- def _gen_mask_from_
filte
r(self, **kwargs) -> str:
+ def _gen_mask_from_
selecto
r(self, **kwargs) -> str:
mask_val = ''
if 'all_fields' in kwargs:
all_fields_without_space = kwargs['all_fields'].replace(" ", "")
mask_val = ''
if 'all_fields' in kwargs:
all_fields_without_space = kwargs['all_fields'].replace(" ", "")
@@
-145,24
+145,23
@@
class o2_marshal_with(marshal_with):
# continue
# mask_val_list.append(f)
# mask_val = '{%s}' % ','.join(mask_val_list)
# continue
# mask_val_list.append(f)
# mask_val = '{%s}' % ','.join(mask_val_list)
-
default_fields
= {}
+
selector
= {}
- self.__update_filter_value(
- default_fields, fields_without_space, True)
+ self.__update_selector_value(selector, fields_without_space, True)
- mask_val = self.__gen_mask_from_
filter_tree(default_fields
)
+ mask_val = self.__gen_mask_from_
selector(selector
)
elif 'exclude_fields' in kwargs and kwargs['exclude_fields'] != '':
exclude_fields_without_space = kwargs['exclude_fields'].replace(
" ", "")
elif 'exclude_fields' in kwargs and kwargs['exclude_fields'] != '':
exclude_fields_without_space = kwargs['exclude_fields'].replace(
" ", "")
-
default_fields = self.__gen_filter_tree
_from_model_with_value(
+
selector = self.__gen_selector
_from_model_with_value(
self.fields)
self.fields)
- self.__update_
filte
r_value(
-
default_fields
, exclude_fields_without_space, False)
+ self.__update_
selecto
r_value(
+
selector
, exclude_fields_without_space, False)
- mask_val = self.__gen_mask_from_
filter_tree(default_fields
)
+ mask_val = self.__gen_mask_from_
selector(selector
)
elif 'exclude_default' in kwargs and kwargs['exclude_default'] != '':
exclude_default_without_space = kwargs['exclude_default'].replace(
" ", "")
elif 'exclude_default' in kwargs and kwargs['exclude_default'] != '':
exclude_default_without_space = kwargs['exclude_default'].replace(
" ", "")
@@
-184,47
+183,47
@@
class o2_marshal_with(marshal_with):
else:
return '{%s}' % f[0]
else:
return '{%s}' % f[0]
- def __gen_
filter_tree
_from_model_with_value(
+ def __gen_
selector
_from_model_with_value(
self, model: Model, default_val: bool = True) -> dict:
self, model: Model, default_val: bool = True) -> dict:
-
filte
r = dict()
+
selecto
r = dict()
for i in model:
if type(model[i]) is List:
if type(model[i].container) is String:
for i in model:
if type(model[i]) is List:
if type(model[i].container) is String:
-
filte
r[i] = default_val
+
selecto
r[i] = default_val
continue
continue
-
filter[i] = self.__gen_filter_tree
_from_model_with_value(
+
selector[i] = self.__gen_selector
_from_model_with_value(
model[i].container.model, default_val)
continue
elif type(model[i]) is Nested:
model[i].container.model, default_val)
continue
elif type(model[i]) is Nested:
-
filter[i] = self.__gen_filter_tree
_from_model_with_value(
+
selector[i] = self.__gen_selector
_from_model_with_value(
model[i].model, default_val)
model[i].model, default_val)
-
filte
r[i] = default_val
- return
filte
r
+
selecto
r[i] = default_val
+ return
selecto
r
- def __update_
filter_value(self, default_fields
: dict, filter: str,
- val: bool):
+ def __update_
selector_value(self, default_selector
: dict, filter: str,
+
val: bool):
fields = filter.split(',')
for f in fields:
if '/' in f:
fields = filter.split(',')
for f in fields:
if '/' in f:
- self.__update_
filter_tree_value(default_fields
, f, val)
+ self.__update_
selector_tree_value(default_selector
, f, val)
continue
continue
- default_
fields
[f] = val
+ default_
selector
[f] = val
- def __update_
filte
r_tree_value(self, m: dict, filter: str, val: bool):
+ def __update_
selecto
r_tree_value(self, m: dict, filter: str, val: bool):
filter_list = filter.split('/', 1)
if filter_list[0] not in m:
m[filter_list[0]] = dict()
if len(filter_list) > 1:
filter_list = filter.split('/', 1)
if filter_list[0] not in m:
m[filter_list[0]] = dict()
if len(filter_list) > 1:
- self.__update_
filte
r_tree_value(
+ self.__update_
selecto
r_tree_value(
m[filter_list[0]], filter_list[1], val)
return
m[filter_list[0]] = val
m[filter_list[0]], filter_list[1], val)
return
m[filter_list[0]] = val
- def __gen_mask_from_
filter_tree
(self, fields: dict) -> str:
+ def __gen_mask_from_
selector
(self, fields: dict) -> str:
mask_li = list()
for k, v in fields.items():
if type(v) is dict:
mask_li = list()
for k, v in fields.items():
if type(v) is dict:
- s = self.__gen_mask_from_
filter_tree
(v)
+ s = self.__gen_mask_from_
selector
(v)
mask_li.append('%s%s' % (k, s))
continue
if v:
mask_li.append('%s%s' % (k, s))
continue
if v: