Infra/tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

split cache/value/setting in plugin

Browse Source
This commit is contained in:
Emmanuel Garette
2013-08-14 23:06:31 +02:00
parent 513722ed57
commit f6f709f83d
8 changed files with 290 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
tiramisu/setting.py
View File

@ -24,6 +24,8 @@ from time import time
from copy import copy
from tiramisu.error import RequirementError, PropertiesOptionError
from tiramisu.i18n import _
from tiramisu.plugins.dictionary.setting import PluginSettings
default_encoding = 'utf-8'
expires_time = 5
@ -158,12 +160,12 @@ class Property(object):
def append(self, propname):
self._properties.add(propname)
self._setting._set_properties(self._properties, self._opt)
self._setting._setproperties(self._properties, self._opt)
def remove(self, propname):
if propname in self._properties:
self._properties.remove(propname)
self._setting._set_properties(self._properties, self._opt)
self._setting._setproperties(self._properties, self._opt)
def reset(self):
self._setting.reset(opt=self._opt)
@ -176,31 +178,26 @@ class Property(object):
#____________________________________________________________
class Setting(object):
class Settings(PluginSettings):
"``Config()``'s configuration options"
__slots__ = ('context', '_properties', '_permissives', '_owner', '_cache')
__slots__ = ('context', '_owner')
def __init__(self, context):
# properties attribute: the name of a property enables this property
# key is None for global properties
self._properties = {}
# permissive properties
self._permissives = {}
# generic owner
self._owner = owners.user
self.context = context
self._cache = {}
super(Settings, self).__init__()
#____________________________________________________________
# properties methods
def __contains__(self, propname):
return propname in self._get_properties()
return propname in self._getproperties()
def __repr__(self):
return str(list(self._get_properties()))
return str(list(self._getproperties()))
def __getitem__(self, opt):
return Property(self, self._get_properties(opt), opt)
return Property(self, self._getproperties(opt), opt)
def __setitem__(self, opt, value):
raise ValueError('you must only append/remove properties')
@ -210,50 +207,49 @@ class Setting(object):
raise ValueError(_('opt and all_properties must not be set '
'together in reset'))
if all_properties:
self._properties = {}
self._p_reset_all_propertives()
else:
try:
del(self._properties[opt])
except KeyError:
pass
self._p_reset_properties(opt)
self.context.cfgimpl_reset_cache()
def _get_properties(self, opt=None, is_apply_req=True):
def _getproperties(self, opt=None, is_apply_req=True):
if opt is None:
props = self._properties.get(opt, set(default_properties))
props = self._p_getproperties(opt, default_properties)
else:
exp = None
if opt in self._cache:
exp = time()
props, created = self._cache[opt]
if exp < created:
ntime = None
if self._p_hascache('properties', opt):
ntime = time()
is_cached, props = self._p_getcache('properties', opt, ntime)
if is_cached:
return props
if is_apply_req:
self.apply_requires(opt)
props = self._properties.get(opt, set(opt._properties))
self._set_cache(opt, props, exp)
props = self._p_getproperties(opt, opt._properties)
if 'expire' in self:
if ntime is None:
ntime = time()
self._p_setcache('properties', opt, props, ntime + expires_time)
return props
def append(self, propname):
"puts property propname in the Config's properties attribute"
Property(self, self._get_properties()).append(propname)
Property(self, self._getproperties()).append(propname)
def remove(self, propname):
"deletes property propname in the Config's properties attribute"
Property(self, self._get_properties()).remove(propname)
Property(self, self._getproperties()).remove(propname)
def _set_properties(self, properties, opt=None):
def _setproperties(self, properties, opt=None):
"""save properties for specified opt
(never save properties if same has option properties)
"""
if opt is None:
self._properties[opt] = properties
self._p_setproperties(opt, properties)
else:
if set(opt._properties) == properties:
if opt in self._properties:
del(self._properties[opt])
self._p_reset_properties(opt)
else:
self._properties[opt] = properties
self._p_setproperties(opt, properties)
self.context.cfgimpl_reset_cache()
#____________________________________________________________
@ -261,13 +257,13 @@ class Setting(object):
value=None, force_permissive=False,
force_properties=None):
#opt properties
properties = copy(self._get_properties(opt_or_descr))
properties = copy(self._getproperties(opt_or_descr))
#remove opt permissive
properties -= self._get_permissive(opt_or_descr)
properties -= self._p_getpermissive(opt_or_descr)
#remove global permissive if need
self_properties = copy(self._get_properties())
self_properties = copy(self._getproperties())
if force_permissive is True or 'permissive' in self_properties:
properties -= self._get_permissive()
properties -= self._p_getpermissive()
#global properties
if force_properties is not None:
@ -280,8 +276,8 @@ class Setting(object):
properties -= frozenset(('mandatory', 'frozen'))
else:
if 'mandatory' in properties and \
not self.context.cfgimpl_get_values()._is_empty(opt_or_descr,
value):
not self.context.cfgimpl_get_values()._isempty(opt_or_descr,
value):
properties.remove('mandatory')
if is_write and 'everything_frozen' in self_properties:
properties.add('frozen')
@ -299,13 +295,11 @@ class Setting(object):
"named: {0} with properties {1}"
"").format(opt_or_descr._name, str(props)), props)
def _get_permissive(self, opt=None):
return self._permissives.get(opt, frozenset())
#FIXME should be setpermissive
def set_permissive(self, permissive, opt=None):
if not isinstance(permissive, tuple):
raise TypeError(_('permissive must be a tuple'))
self._permissives[opt] = frozenset(permissive)
self._p_setpermissive(opt, permissive)
#____________________________________________________________
def setowner(self, owner):
@ -332,22 +326,11 @@ class Setting(object):
"convenience method to freeze, hidde and disable"
self._read(rw_remove, rw_append)
def _set_cache(self, opt, props, exp):
if 'expire' in self:
if exp is None:
exp = time()
self._cache[opt] = (props, time() + expires_time)
def reset_cache(self, only_expired):
if only_expired:
exp = time()
keys = self._cache.keys()
for key in keys:
props, created = self._cache[key]
if exp > created:
del(self._cache[key])
self._p_reset_expired_cache('properties', time())
else:
self._cache.clear()
self._p_reset_all_cache('properties')
def apply_requires(self, opt):
"carries out the jit (just in time requirements between options"
@ -355,7 +338,7 @@ class Setting(object):
return
# filters the callbacks
setting = Property(self, self._get_properties(opt, False), opt)
setting = Property(self, self._getproperties(opt, False), opt)
descr = self.context.cfgimpl_get_description()
optpath = descr.impl_get_path_by_opt(opt)
for requires in opt._requires: