Skip to content

Commit 9985463

Browse files
committed
iniinfo -fix recording of legacy INI MDI commands
1 parent 59a19ba commit 9985463

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

lib/python/common/iniinfo.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,9 @@ def update(self):
564564
# here we separate them to two lists (legacy) and one dict
565565
# action_button takes it from there.
566566
self.MDI_COMMAND_DICT={}
567+
self.MDI_COMMAND_LIST = []
568+
self.MDI_COMMAND_LABEL_LIST = []
569+
567570
# suppress error message is there is no section at all
568571
if self.parser.has_section('MDI_COMMAND_LIST'):
569572
try:
@@ -573,25 +576,31 @@ def update(self):
573576
# in this case order matters in the INI
574577
if key == 'MDI_COMMAND':
575578
LOG.warning("INI file's MDI_COMMAND_LIST is using legacy 'MDI_COMMAND =' entries")
576-
self.MDI_COMMAND_LIST = []
577-
self.MDI_COMMAND_LABEL_LIST = []
578579
temp = (self.INI.findall("MDI_COMMAND_LIST", "MDI_COMMAND")) or None
579580
if temp is None:
580-
self.MDI_COMMAND_LABEL_LIST.append(None)
581+
self.MDI_COMMAND_LIST.append(None)
581582
self.MDI_COMMAND_LABEL_LIST.append(None)
582583
else:
583-
for i in temp:
584+
for count, i in enumerate(temp):
585+
mdidatadict = {}
584586
for num,k in enumerate(i.split(',')):
585587
if num == 0:
586588
self.MDI_COMMAND_LIST.append(k)
589+
mdidatadict['cmd'] = k
587590
if len(i.split(',')) <2:
588591
self.MDI_COMMAND_LABEL_LIST.append(None)
592+
mdidatadict['label'] = None
589593
else:
590594
self.MDI_COMMAND_LABEL_LIST.append(k)
595+
mdidatadict['label'] = k
596+
self.MDI_COMMAND_DICT[str(count)] = mdidatadict
597+
break
591598

592599
# new way: 'MDI_COMMAND_SSS = XXXX' (SSS being any string)
593600
# order of commands doesn't matter in the INI
594601
else:
602+
self.MDI_COMMAND_LIST.append(None)
603+
self.MDI_COMMAND_LABEL_LIST.append(None)
595604
try:
596605
temp = self.INI.find("MDI_COMMAND_LIST",key)
597606
name = (key.replace('MDI_COMMAND_',''))

0 commit comments

Comments
 (0)