cleanup and file system backed properties

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-06 17:15:45 +02:00
parent 0d9906b0b8
commit 12dc0d2bdd

View file

@ -20,9 +20,13 @@
# #
import os import os
import collections
import cdist import cdist
import cdist.path import cdist.core.property
DOT_CDIST = '.cdist'
class Object(object): class Object(object):
@ -73,27 +77,64 @@ class Object(object):
"""Return a list of object names""" """Return a list of object names"""
for path, dirs, files in os.walk(cls.base_dir()): for path, dirs, files in os.walk(cls.base_dir()):
# FIXME: use constant instead of string # FIXME: use constant instead of string
if cdist.path.DOT_CDIST in dirs: if DOT_CDIST in dirs:
yield os.path.relpath(path, cls.base_dir()) yield os.path.relpath(path, cls.base_dir())
def __init__(self, type, object_id=None, parameter=None, requirements=None): def __init__(self, type, object_id=None, parameters=None, requirements=None):
self.type = type # instance of Type self.type = type # instance of Type
self.object_id = object_id self.object_id = object_id
self.qualified_name = os.path.join(self.type.name, self.object_id) self.name = os.path.join(self.type.name, self.object_id)
self.parameter = parameter or {} self.parameters = parameters or {}
self.requirements = requirements or [] self.requirements = requirements or []
self.__parameters = None
self.__requirements = None
def __repr__(self): def __repr__(self):
return '<Object %s>' % self.qualified_name return '<Object %s>' % self.name
@property @property
def path(self): def path(self):
return os.path.join( return os.path.join(
self.base_dir(), self.base_dir(),
self.qualified_name, self.name,
cdist.path.DOT_CDIST DOT_CDIST
) )
### requirements
@property
def requirements(self):
if not self.__requirements:
self.__requirements = cdist.core.property.FileList(os.path.join(self.path, "require"))
return self.__requirements
@requirements.setter
def requirements(self, value):
if isinstance(value, cdist.core.property.FileList):
self.__requirements = value
else:
self.__requirements = cdist.core.property.FileList(os.path.join(self.path, "require"), value)
### /requirements
### parameters
@property
def parameters(self):
if not self.__parameters:
self.__parameters = cdist.core.property.DirectoryDict(os.path.join(self.path, "parameter"))
return self.__parameters
@parameters.setter
def parameters(self, value):
if isinstance(value, cdist.core.property.DirectoryDict):
self.__parameters = value
else:
self.__parameters = cdist.core.property.DirectoryDict(os.path.join(self.path, "parameter"), value)
### /parameters
### changed
@property @property
def changed(self): def changed(self):
"""Check whether the object has been changed.""" """Check whether the object has been changed."""
@ -111,5 +152,6 @@ class Object(object):
except EnvironmentError: except EnvironmentError:
# ignore # ignore
pass pass
### /changed
# FIXME: implement other properties/methods # FIXME: implement other properties/methods