Added default config file building

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

apps/dashboard/xaal/dashboard/core/xaal_core.py

@@ -34,7 +34,11 @@ def setup():
     """ setup xAAL Engine & Device. And start it in a Greenlet"""
     global monitor 
     engine = Engine()
-    cfg = tools.load_cfg_or_die(PACKAGE_NAME)
+    cfg = tools.load_cfg(PACKAGE_NAME)
+    if not cfg:
+        logger.info('Missing config file, building a new one')
+        cfg = tools.new_cfg(PACKAGE_NAME)
+        cfg.write()
 
     dev            = Device("hmi.basic")
     dev.address    = cfg['config']['addr']
@@ -47,6 +51,8 @@ def setup():
     db_server = None
     if 'db_server' in cfg['config'].keys():
         db_server = cfg['config']['db_server']
+    else:
+        logger.info('You can set "db_server" in the config file')
     monitor = Monitor(dev,filter_func=monitor_filter,db_server=db_server)
     monitor.subscribe(event_handler)
     

apps/rest/xaal/rest/app.py

@@ -36,8 +36,11 @@ def setup_xaal():
     """ setup xAAL Engine & Device. And start it in a Greenlet"""
     global monitor 
     engine = Engine()
-    cfg = tools.load_cfg_or_die(PACKAGE_NAME)
-
+    cfg = tools.load_cfg(PACKAGE_NAME)
+    if not cfg:
+        logger.info("No config file found, building a new one")
+        cfg = tools.new_cfg(PACKAGE_NAME)
+        cfg.write()
     dev            = Device("hmi.basic")
     dev.address    = cfg['config']['addr']
     dev.vendor_id  = "IHSEV"

core/metadb/xaal/metadb/app.py

@@ -11,11 +11,20 @@ logger = tools.get_logger(PACKAGE_NAME,'DEBUG')
 class MetaDB(object):
     def __init__(self,engine):
         self.engine = engine
-        self.cfg = tools.load_cfg_or_die(PACKAGE_NAME)
+        self.config()
         self.setup()
         self.dirty = False
         atexit.register(self.periodic_save)
 
+    def config(self):
+        cfg = tools.load_cfg(PACKAGE_NAME)
+        if not cfg:
+            logger.info('Missing config file, building a new one')
+            cfg = tools.new_cfg(PACKAGE_NAME)
+            cfg['devices'] = {}
+            cfg.write()
+        self.cfg = cfg
+
     def setup(self):
         addr = self.cfg['config']['addr']
         dev            = Device("metadatadb.basic")

devices/notifications/gtk-notify/xaal/gtknotify/dev.py

@@ -9,7 +9,12 @@ gi.require_version('Notify', '0.7')
 from gi.repository import Notify
 
 def register_device(engine):
-    cfg = tools.load_cfg_or_die(PACKAGE_NAME)
+    cfg = tools.load_cfg(PACKAGE_NAME)
+    if not cfg:
+        logger.info('Missing config file, building a new one')
+        cfg = tools.new_cfg(PACKAGE_NAME)
+        cfg.write()
+    
     dev = Device("notification.desktop")
     dev.address     = cfg['config']['addr']
     dev.product_id = "GTK Notification device"

libs/lib/xaal/lib/tools.py

@@ -55,7 +55,6 @@ def load_cfg(app_name):
     filename = get_cfg_filename(app_name)
     return load_cfg_file(filename)
 
-
 def load_cfg_or_die(app_name):
     cfg = load_cfg(app_name)
     if not cfg:
@@ -63,6 +62,14 @@ def load_cfg_or_die(app_name):
         sys.exit(-1)
     return cfg
 
+def new_cfg(app_name):
+    filename = get_cfg_filename(app_name)
+    cfg = ConfigObj(filename,indent_type='  ')
+    cfg['config'] = {}
+    cfg['config']['addr']=get_random_uuid()
+    return cfg
+
+
 """
 def get_cfg_addr(app_name):
     cfg_file = get_cfg_file(app_name)
@@ -73,7 +80,6 @@ def get_cfg_addr(app_name):
 
     addr = cfg.get(app_name, 'xaaladdr')
     return addr
-"""
 
 
 def new_cfg(filename, app_name):
@@ -83,7 +89,7 @@ def new_cfg(filename, app_name):
     f = open(filename, 'w')
     cfg.write(f)
     return cfg
-
+"""
 
 def get_random_uuid():
     return str(uuid.uuid1())