Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ini2json: Update with missing stuff. Make sure lists are lists.

master
per 2014-01-09 00:22:00 +01:00
parent a9162e84f0
commit 134801136b
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/conversion/ini2json/ini2json_generic.py
View File

@ -27,6 +27,7 @@ translation = {
data = {}
fp = open(sys.argv[2])
ids = json.load(fp)
listopts = ['structureModel', 'weapons']
for section in config.sections():
name = config.get(section, 'name')
if name.startswith('"') and name.endswith('"'):
@ -49,11 +50,12 @@ for section in config.sections():
accum.append(ids[result]) # change ID to real name
else:
accum.append(result)
if len(accum) == 1 and key != 'weapons':
entry[key] = accum[0]
else:
if key in listopts:
entry[key] = accum
else:
assert len(accum) == 1, "Wrong number of items in %s:%s - %s" % (section, opt, str(accum))
entry[key] = accum[0]
entry['id'] = section # for backwards compatibility
data[name] = entry
data['id'] = section # for backwards compatibility
fp.close()
print json.dumps(data, indent=4, separators=(',', ': '))
print json.dumps(data, indent=4, separators=(',', ': '), sort_keys=True)

12
tools/conversion/ini2json/ini2json_research.py
View File

@ -21,7 +21,8 @@ fp = open(sys.argv[2])
ids = json.load(fp)
opts = ['researchPoints', 'researchPower', 'keyTopic', 'msgName', 'iconID', 'statID', 'requiredResearch', 'resultComponents',
'techCode', 'imdName', 'subgroupIconID', 'requiredStructures', 'redStructures', 'redComponents', 'resultComponents',
'replacedComponents']
'replacedComponents', 'resultStructures']
listopts = ['requiredResearch', 'resultComponents', 'requiredStructures', 'redStructures', 'redComponents', 'resultComponents', 'replacedComponents', 'resultStructures']
for section in config.sections():
name = config.get(section, 'name')
if name.startswith('"') and name.endswith('"'):
@ -41,10 +42,11 @@ for section in config.sections():
accum.append(ids[result]) # change ID to real name
else:
accum.append(result)
if len(accum) == 1:
if not opt in listopts:
assert len(accum) == 1, "Wrong number of items in %s:%s - %s" % (section, opt, str(accum))
entry[opt] = accum[0]
else:
entry[opt] = accum
entry[opt] = accum # is a list
if config.has_option(section, 'results'):
value = config.get(section, 'results')
value = value.split(',')
@ -72,7 +74,7 @@ for section in config.sections():
tmp[comps[0]] = int(comps[1])
accum.append(tmp)
entry['results'] = accum
entry['id'] = section # for backwards compatibility
data[name] = entry
data['id'] = section # for backwards compatibility
fp.close()
print json.dumps(data, indent=4, separators=(',', ': '))
print json.dumps(data, indent=4, separators=(',', ': '), sort_keys=True)