jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a context manager to helpers.overlay.CfgCache. 

* New: In CRL/helpers.overlay.CfgCache, add support for context manager,
    so we can progressively remove the use of Configuration. One class
    to use in all contexts (immedaite setting or storing a set of
    Cfg parameters).
This commit is contained in:
Jean-Paul Chaput 2020-08-05 01:25:48 +02:00
parent 5027d5d5ef
commit 78b7e683e5
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crlcore/python/helpers/overlay.py
View File

@ -178,10 +178,18 @@ class CfgCache ( object ):
if p.type == Cfg.Parameter.Type.Percentage: return p.asDouble()/100.0 if p.type == Cfg.Parameter.Type.Percentage: return p.asDouble()/100.0
return p.asString() return p.asString()
def __init__ ( self, path ): def __enter__( self ):
return self
def __exit__( self, *args ):
self.apply()
self.display()
def __init__ ( self, path='', priority=None ):
"""Create a new CfgCache with a ``path`` as parent path.""" """Create a new CfgCache with a ``path`` as parent path."""
self._path = path self._priority = priority
self._rattr = {} self._path = path
self._rattr = {}
return return
def __setattr__ ( self, attr, v ): def __setattr__ ( self, attr, v ):
@ -233,28 +241,29 @@ class CfgCache ( object ):
""" """
if not self._rattr.has_key(attr): if not self._rattr.has_key(attr):
path = self._path+'.'+attr if len(self._path) else attr path = self._path+'.'+attr if len(self._path) else attr
self._rattr[attr] = CfgCache( path ) self._rattr[attr] = CfgCache( path, self._priority )
return self._rattr[attr] return self._rattr[attr]
def apply ( self, priority=Cfg.Parameter.Priority.UserFile ): def apply ( self, priority=None ):
"""Apply the parameters values stored in the cache to the ``Cfg`` database.""" """Apply the parameters values stored in the cache to the ``Cfg`` database."""
if not len(self._path): if priority is None: priority = self._priority
if not len(self._path) and priority is not None:
Cfg.Configuration.pushDefaultPriority( priority ) Cfg.Configuration.pushDefaultPriority( priority )
for attrName in self._rattr.keys(): for attrName in self._rattr.keys():
if isinstance(self._rattr[attrName],CfgCache): if isinstance(self._rattr[attrName],CfgCache):
self._rattr[attrName].apply() self._rattr[attrName].apply()
continue continue
CfgCache.setCfgParameter( self._path+'.'+attrName,self._rattr[attrName] ) CfgCache.setCfgParameter( self._path+'.'+attrName,self._rattr[attrName] )
if not len(self._path): if not len(self._path) and priority is not None:
Cfg.Configuration.popDefaultPriority() Cfg.Configuration.popDefaultPriority()
def display ( self ): def display ( self ):
"""Print all the parameters stored in that CfgCache.""" """Print all the parameters stored in that CfgCache."""
if not len(self._path): if not len(self._path):
print( 'Configuration (Cfg) cache:' ) print( ' o Applying configuration (CfgCache):' )
for attrName in self._rattr.keys(): for attrName in self._rattr.keys():
if isinstance(self._rattr[attrName],CfgCache): if isinstance(self._rattr[attrName],CfgCache):
self._rattr[attrName].display() self._rattr[attrName].display()
continue continue
print( '* {}.{} = {}'.format(self._path,attrName,self._rattr[attrName]) ) print( ' - {}.{} = {}'.format(self._path,attrName,self._rattr[attrName]) )