Finished the metadb API

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/trunk@1878 b32b6428-25c9-4566-ad07-03861ab6144f

core/metadb/xaal/metadb/app.py

@@ -2,6 +2,7 @@
 from xaal.lib import Engine,Device,tools
 import platform
 import copy
+import atexit
 
 PACKAGE_NAME = "xaal.metadb"
 logger = tools.get_logger(PACKAGE_NAME,'DEBUG')
@@ -13,6 +14,7 @@ class MetaDB(object):
         self.cfg = tools.load_cfg_or_die(PACKAGE_NAME)
         self.setup()
         self.dirty = False
+        atexit.register(self.periodic_save)
         
         
     def setup(self):
@@ -29,7 +31,10 @@ class MetaDB(object):
         dev.add_method('getKeysValues',self.get_keys_values)
         dev.add_method('getValue', self.get_value)
         dev.add_method('updateKeysValues', self.update_keys_values)
+        dev.add_method('addKeysValues', self.add_keys_values)
+
         
+        self.dev = dev
         self.engine.add_device(dev)
         self.engine.add_timer(self.periodic_save,60)
 
@@ -93,24 +98,55 @@ class MetaDB(object):
 
     def update_keys_values(self,_device,_map):
         dev = self.get_device(_device)
+        updated = {}
         if dev:
-            dev.update(_map)
+            # if _map is empty, remove the device
+            if _map == None:
+                self.cfg['devices'].pop(_device)
+                self.dirty = True
+                return
+            # loop throught the map 
+            for k in _map:
+                # remove item if empty
+                if _map[k] == None:
+                    dev.pop(k)
+                    self.dirty = True
+                else:
+                    dev.update({k:_map[k]})
+                    updated.update({k:_map[k]})
+                    self.dirty = True
         else:
-            self.cfg['devices'].update({_device:_map})
-        self.dirty = True
+            self.cfg['devices'][_device]=_map
+            updated = _map
+            self.dirty = True
+
+        if len(updated):
+            self.engine.send_attributes_change(self.dev,{'device':_device,'map':updated})
+            
 
+    def add_keys_values(self,_device,_map):
+        dev = self.get_device(_device)
+        updated = {}
+        if dev:
+            for k in _map:
+                if k not in dev.keys():
+                    dev.update({k:_map[k]})
+                    updated.update({k:_map[k]})
+                    self.dirty = True
+        else:
+            self.cfg['devices'][_device]=_map
+            updated = _map
+            self.dirty = True
+            
+        if len(updated):
+            self.engine.send_attributes_change(self.dev,{'device':_device,'map':updated})
             
     def periodic_save(self):
         if self.dirty:
             logger.info("Saving configuration file")
-            self.commit()
+            self.cfg.write()
             self.dirty = False
 
-
-    def commit(self):
-        self.cfg.write()
-
-
 def run():
     eng = Engine()    
     mdb = MetaDB(eng)