X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnepi%2Fcore%2Fattributes.py;h=02f68c383c224f7e8368d205650784e4bffdae27;hb=a1233ac69a70a36c55d1212d5b019bbf6cf8835b;hp=53560ba3d03b401f1bfcec5c344577e7fad8eed1;hpb=57808ae1bede9fbe038c4cfc968c2e6efe759220;p=nepi.git

diff --git a/src/nepi/core/attributes.py b/src/nepi/core/attributes.py
index 53560ba3..02f68c38 100644
--- a/src/nepi/core/attributes.py
+++ b/src/nepi/core/attributes.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# vim:ts=4:sw=4:et:ai:sts=4
 
 class AttributesMap(object):
     """AttributesMap is the base class for every object whose attributes 
@@ -12,14 +12,8 @@ class AttributesMap(object):
     def attributes_name(self):
         return set(self._attributes.keys())
 
-    def is_valid_attribute_value(self, name, value):
-        raise NotImplementedError
-
     def set_attribute_value(self, name, value):
-        if self.is_valid_attribute_value(name, value):
-            self._attributes[name].value = value
-            return True
-        return False
+        self._attributes[name].value = value
 
     def set_attribute_readonly(self, name, value):
         self._attributes[name].readonly = value
@@ -43,10 +37,11 @@ class AttributesMap(object):
         return self._attributes[name].readonly
 
     def add_attribute(self, name, help, type, value = None, range = None,
-        allowed = None, readonly = False):
+        allowed = None, readonly = False, validation_function = None):
         if name in self._attributes:
-            raise AttributeError('Attribute %s already exists' % name))
-        attribute = Attribute(name, help, type, value, range, allowed, readonly)
+            raise AttributeError("Attribute %s already exists" % name)
+        attribute = Attribute(name, help, type, value, range, allowed, readonly,
+                validation_function)
         self._attributes[name] = attribute
 
     def del_attribute(self, name):
@@ -59,23 +54,73 @@ class AttributesMap(object):
         self._attributes = dict()
 
 class Attribute(object):
-    STRING , BOOL, ENUM, DOUBLE, INTEGER, ENDPOINT, TIME = (
-		"STRING", "BOOL", "ENUM", "DOUBLE", "INTEGER", "ENDPOINT", "TIME")
+    STRING, BOOL, ENUM, DOUBLE, INTEGER = (
+		"STRING", "BOOL", "ENUM", "DOUBLE", "INTEGER")
 
-    types = [STRING, BOOL, ENUM, DOUBLE, INTEGER, ENDPOINT, TIME]
+    types = [STRING, BOOL, ENUM, DOUBLE, INTEGER]
 
     def __init__(self, name, help, type, value = None, range = None,
-        allowed = None, readonly = False):
+        allowed = None, readonly = False, validation_function = None):
         if not type in Attribute.types:
             raise AttributeError("invalid type %s " % type)
         self.name = name
-        self.value = value
-        self.type = type
-        self.help = help
-        self.readonly = (readonly == True)
-        self.modified = False
+        self._type = type
+        self._help = help
+        self._value = value
+        self._validation_function = validation_function
+        self._readonly = (readonly == True)
+        self._modified = False
         # range: max and min possible values
-        self.range = range
+        self._range = range
         # list of possible values
-        self.allowed = allowed
+        self._allowed = allowed
+
+    @property
+    def type(self):
+        return self._type
+
+    @property
+    def help(self):
+        return self._help
+
+    @property
+    def readornly(self):
+        return self._readonly
+
+    @property
+    def modified(self):
+        return self._modified
+
+    @property
+    def range(self):
+        return self._range
+
+    @property
+    def allowed(self):
+        return self._allowed
+
+    def get_value(self):
+        return self._value
+
+    def set_value(self, value):
+        if self._is_in_range(value) and \
+                self._is_in_allowed_values(value) and \
+                self._is_valid(value):
+            self._value = value
+            self._modified = True
+        else:
+            raise RuntimeError("Invalid value %s for attribute %s" %
+                    (str(value), self.name))
+
+    value = property(get_value, set_value)
+
+    def _is_in_range(self, value):
+        return not self.range or \
+                (value >= self.range[0] and value <= self.range[1])
+
+    def _is_in_allowed_values(self, value):
+        return not self.allowed or value in self._allowed
+
+    def _is_valid(self, value):
+        return not self._validation_function or self._validation_function(value)