6 Commits

2 changed files with 31 additions and 17 deletions

View File

@ -1,5 +1,5 @@
from .api import Config from .api import Config
__version__ = "0.2" __version__ = "0.5"
__all__ = ('Config',) __all__ = ('Config',)

View File

@ -26,7 +26,8 @@ TYPE = {'boolean': bool,
'broadcast_address': str, 'broadcast_address': str,
'port': str, 'port': str,
'domainname': str, 'domainname': str,
'date': str} 'date': str,
'float': float}
class Option: class Option:
@ -225,13 +226,14 @@ class _Value:
withwarning: bool=False, withwarning: bool=False,
flatten: bool=False): flatten: bool=False):
ret = {} ret = {}
self._dict_walk(ret, if self.schema:
self.schema, self._dict_walk(ret,
self.path, self.schema,
fullpath, self.path,
withwarning, fullpath,
flatten, withwarning,
None) flatten,
None)
return ret return ret
@ -326,11 +328,11 @@ class TiramisuOptionValue(_Value):
def set(self, value): def set(self, value):
type_ = self.schema['type'] type_ = self.schema['type']
leader_old_value = undefined leader_old_value = undefined
if self.config.is_hidden(self.path, self.index): remote = self.config.form.get(self.path, {}).get('remote', False)
if not remote and self.config.is_hidden(self.path, self.index):
raise PropertiesOptionError(None, {'disabled'}, None, opt_type='option') raise PropertiesOptionError(None, {'disabled'}, None, opt_type='option')
if self.config.isleader(self.path): if self.config.isleader(self.path):
leader_old_value = self.config.get_value(self.path) leader_old_value = self.config.get_value(self.path)
remote = self.config.form.get(self.path, {}).get('remote', False)
if self.index is None and self.schema.get('isMulti', False): if self.index is None and self.schema.get('isMulti', False):
if not isinstance(value, list): if not isinstance(value, list):
raise ValueError('value must be a list') raise ValueError('value must be a list')
@ -609,9 +611,12 @@ class ContextValue(_Value):
config: 'Config', config: 'Config',
schema: Dict) -> None: schema: Dict) -> None:
self.config = config self.config = config
first = next(iter(schema.keys())) if schema:
self.path = first.rsplit('.', 1)[0] first = next(iter(schema.keys()))
self.schema = {'properties': schema} self.path = first.rsplit('.', 1)[0]
self.schema = {'properties': schema}
else:
self.schema = {}
def __call__(self) -> TiramisuOptionValue: def __call__(self) -> TiramisuOptionValue:
return TiramisuOptionValue(self.config, return TiramisuOptionValue(self.config,
@ -644,6 +649,7 @@ class Config:
# config # config
def __init__(self, def __init__(self,
dico): dico):
self._unrestraint = False
if DEBUG: if DEBUG:
from pprint import pprint from pprint import pprint
pprint(dico) pprint(dico)
@ -668,6 +674,7 @@ class Config:
self.root = first_path.rsplit('.', 1)[0] self.root = first_path.rsplit('.', 1)[0]
else: else:
self.root = '' self.root = ''
self.dico = dico
def __getattr__(self, def __getattr__(self,
subfunc: str) -> Any: subfunc: str) -> Any:
@ -682,6 +689,11 @@ class Config:
if subfunc == 'owner': if subfunc == 'owner':
return ContextOwner(self, return ContextOwner(self,
self.schema) self.schema)
if subfunc == 'unrestraint':
ret = Config(self.dico)
ret._unrestraint = True
ret.temp = self.temp
return ret
raise APIError(_('please specify a valid sub function ({})').format(subfunc)) raise APIError(_('please specify a valid sub function ({})').format(subfunc))
def add_value(self, def add_value(self,
@ -847,6 +859,8 @@ class Config:
path: str, path: str,
index: Optional[int], index: Optional[int],
permissive: bool=False) -> bool: permissive: bool=False) -> bool:
if self._unrestraint:
return False
if permissive: if permissive:
property_ = 'hidden' property_ = 'hidden'
needs = True needs = True
@ -1181,7 +1195,7 @@ class Config:
value: Any) -> bool: value: Any) -> bool:
if not path in self.form or not 'pattern' in self.form[path]: if not path in self.form or not 'pattern' in self.form[path]:
return True return True
if value is None or value is '': if value is None or value == '':
match = True match = True
else: else:
if isinstance(value, int): if isinstance(value, int):