mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-05 17:01:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

preserve order and formatting on creating Metadata from Yaml template (closes #352)

Browse source
This commit is contained in:
Izzy 2017-07-26 09:22:01 +02:00
parent b787ec9e34
commit cbd420e490
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
fdroidserver/update.py
View file

@ -1771,8 +1771,15 @@ def main():
# special tricks are not really needed here, this # special tricks are not really needed here, this
# uses the plain YAML lib # uses the plain YAML lib
if os.path.exists('template.yml'): if os.path.exists('template.yml'):
with open('template.yml') as fp: with open('template.yml') as f:
app = yaml.load(fp) metatxt = f.read()
if 'name' in apk and apk['name'] != '':
metatxt = re.sub(r'^(((Auto)?Name|Summary):).*$', r'\1 ' + apk['name'], metatxt, flags=re.IGNORECASE | re.MULTILINE)
else:
logging.warning(apk['packageName'] + ' does not have a name! Using package name instead.')
metatxt = re.sub(r'^(((Auto)?Name|Summary):).*$', r'\1 ' + apk['packageName'], metatxt, flags=re.IGNORECASE | re.MULTILINE)
with open(os.path.join('metadata', apk['packageName'] + '.yml'), 'w') as f:
f.write(metatxt)
else: else:
app = dict() app = dict()
app['Categories'] = [os.path.basename(os.getcwd())] app['Categories'] = [os.path.basename(os.getcwd())]
@ -1783,12 +1790,12 @@ def main():
app['IssueTracker'] = '' app['IssueTracker'] = ''
app['SourceCode'] = '' app['SourceCode'] = ''
app['CurrentVersionCode'] = 2147483647 # Java's Integer.MAX_VALUE app['CurrentVersionCode'] = 2147483647 # Java's Integer.MAX_VALUE
if 'name' in apk and apk['name'] != '': if 'name' in apk and apk['name'] != '':
app['Name'] = apk['name'] app['Name'] = apk['name']
else: else:
logging.warning(apk['packageName'] + ' does not have a name! Using package name instead.') logging.warning(apk['packageName'] + ' does not have a name! Using package name instead.')
app['Name'] = apk['packageName'] app['Name'] = apk['packageName']
yaml.dump(app, f, default_flow_style=False) yaml.dump(app, f, default_flow_style=False)
logging.info("Generated skeleton metadata for " + apk['packageName']) logging.info("Generated skeleton metadata for " + apk['packageName'])
newmetadata = True newmetadata = True
else: else: