Fix a regex bug, and make xaal-isalive working with *.any

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

apps/tools/xaal/tools/isalive.py

@@ -21,8 +21,10 @@ from xaal.lib import Engine, Device, tools, config,helpers
 
 import sys
 import time
+import logging
 
 helpers.setup_console_logger()
+logger = logging.getLogger("xaal-isalive")
 
 class Scanner:
 
@@ -35,10 +37,13 @@ class Scanner:
         self.eng.add_rx_handler(self.parse_answer)
 
     def query(self,devtype):
+        if not tools.is_valid_devtype(devtype):
+            logger.warning("devtype not valid [%s]" % devtype)
+            return
         self.devtype = devtype
         self.seen = []
 
-        print("[%s] Sending xAAL isAlive [%s]" % (self.addr,self.devtype))
+        logger.info("[%s] searching [%s]" % (self.addr,self.devtype))
         self.eng.send_isAlive(self.dev,[self.devtype,])
 
         print("="*70)
@@ -60,9 +65,12 @@ class Scanner:
                     return
                 #it is really for us ?
                 if self.devtype != 'any.any':
-                    if msg.devtype != self.devtype:
+                    (target_devtype,target_devsubtype) = self.devtype.split('.')
+                    (msg_devtype,msg_devsubtype) = msg.devtype.split('.')
+                    if msg_devtype != target_devtype:
+                        return
+                    if target_devsubtype != 'any' and target_devsubtype != msg_devsubtype:
                         return
-                # already seen this
                 if msg.source in self.seen:
                     return
                 # everything is Ok :)

libs/lib/xaal/lib/tools.py

@@ -32,7 +32,7 @@ from configobj import ConfigObj
 from . import config
 
 XAAL_ADDR_PATTERN = '^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$'
-XAAL_DEVTYPE_PATTERN = '^[a-zA-Z][a-zA-Z0-9_-]*.[a-zA-Z][a-zA-Z0-9_-]*$'
+XAAL_DEVTYPE_PATTERN = '^[a-zA-Z][a-zA-Z0-9_-]*\.[a-zA-Z][a-zA-Z0-9_-]*$'
 
 def get_cfg_filename(name, cfg_dir=config.conf_dir):
     filename = '%s.ini' % name