iniinfo -parse ini commands in a better way

mdi commands with a comma in it (ie MSG, text) would
not be interpeted properly

Author: c-morley

lib/python/common/iniinfo.py

@@ -19,7 +19,7 @@ def __init__(self, ini=None):
         global LOG
         LOG = logger.getLogger(__name__)
         # Force the log level for this module only
-        #LOG.setLevel(logger.DEBUG) # One of DEBUG, INFO, WARNING, ERROR, CRITICAL
+        LOG.setLevel(logger.DEBUG) # One of DEBUG, INFO, WARNING, ERROR, CRITICAL
 
         inipath = os.environ.get('INI_FILE_NAME', '/dev/null')
         self.LINUXCNC_IS_RUNNING = bool(inipath != '/dev/null')
@@ -571,7 +571,6 @@ def update(self):
         if self.parser.has_section('MDI_COMMAND_LIST'):
             try:
                 for key in self.parser['MDI_COMMAND_LIST']:
-
                     # legacy way: list of repeat 'MDI_COMMAND=XXXX'
                     # in this case order matters in the INI
                     if key == 'MDI_COMMAND':
@@ -594,25 +593,50 @@ def update(self):
                                         self.MDI_COMMAND_LABEL_LIST.append(k)
                                         mdidatadict['label'] = k
                                 self.MDI_COMMAND_DICT[str(count)] = mdidatadict
-                        break
 
                     # new way: 'MDI_COMMAND_SSS = XXXX' (SSS being any string)
                     # order of commands doesn't matter in the INI
+
+                    # here are some samples, the last three are difficult
+                    # the third is invalid
+                    # MDI_COMMAND_MACRO1 = G53 G0 Z0;G53 G0 X0 Y0,Goto\nMachn\nZero
+                    #    cmd: G53 G0 Z0;G53 G0 X0 Y0  label: Goto\nMachn\nZero
+
+                    # MDI_COMMAND_MACRO2 = (MSG, macro 2);
+                    #    cmd: (MSG, macro 2);  label:
+
+                    # MDI_COMMAND_MACRO3 = (MSG, macro 2)
+                    #    cmd: (MSG  label:  macro 2)
+
+                    # MDI_COMMAND_MACRO4 = (MSG, macro 2),test
+                    #    cmd: (MSG, macro 2)  label: test
+
                     else:
                         self.MDI_COMMAND_LIST.append(None)
                         self.MDI_COMMAND_LABEL_LIST.append(None)
                         try:
                             temp = self.INI.find("MDI_COMMAND_LIST",key)
                             name = (key.replace('MDI_COMMAND_',''))
                             mdidatadict = {}
-                            for num,k in enumerate(temp.split(',')):
-                                if num == 0:
-                                    mdidatadict['cmd'] = k
-                                    if len(temp.split(',')) <2:
-                                        mdidatadict['label'] = None
-                                else:
-                                    mdidatadict['label'] = k
+
+                            # find the last colon in string or 0
+                            lastCmd = temp.rfind(';')
+                            #print('l ;:',lastCmd)
+                            if lastCmd == -1: lastCmd = 0
+
+                            # find the last colon in string or use the string length
+                            lastComma = temp.rfind(',', lastCmd)
+                            #print('l comma:',lastComma,lastCmd)
+                            if lastComma == -1: lastComma = len(temp)
+
+                            label = temp[lastComma+1:]
+                            cmd = temp[:lastComma]
+                            #print(temp,' cmd:',cmd,' label:',label)
+
+                            mdidatadict['cmd'] = cmd
+                            mdidatadict['label'] = label
                             self.MDI_COMMAND_DICT[name] = mdidatadict
+
                         except Exception as e:
                             LOG.error('INI MDI command parse error:{}'.format(e))
             except Exception as e: