mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-12 18:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

metadata: transform all TYPE_STRING values w/ _normalize_type_string()

Browse source 
Before this, there were separate post-parse paths for app-fields versus
build-flags.  This makes all TYPE_STRING values always go through the same
post-parse code path.
This commit is contained in:
Hans-Christoph Steiner 2023-04-24 14:15:45 +02:00
parent a8531a03a6
commit dbe21b2b94
2 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

35
fdroidserver/metadata.py
View file

@ -761,6 +761,23 @@ def parse_yaml_metadata(mf):
return yamldata
def _normalize_type_string(v):
"""Normalize any data to TYPE_STRING.
YAML 1.2's booleans are all lowercase.
Things like versionName are strings, but without quotes can be
numbers. Like "versionName: 1.0" would be a YAML float, but
should be a string.
"""
if isinstance(v, bool):
if v:
return 'true'
return 'false'
return str(v)
def post_parse_yaml_metadata(yamldata):
"""Convert human-readable metadata data structures into consistent data structures.
@ -769,19 +786,6 @@ def post_parse_yaml_metadata(yamldata):
fixed value type, regardless of YAML 1.2's type auto-detection.
"""
def _normalize_type_string(v):
"""YAML 1.2's booleans are all lowercase.
Things like versionName are strings, but without quotes can be
numbers. Like "versionName: 1.0" would be a YAML float, but
should be a string.
"""
if isinstance(v, bool):
return str(v).lower()
return str(v)
for k, v in yamldata.items():
if fieldtype(k) == TYPE_LIST:
if isinstance(v, str):
@ -792,7 +796,7 @@ def post_parse_yaml_metadata(yamldata):
if v:
yamldata[k] = int(v)
elif fieldtype(k) == TYPE_STRING:
if v:
if v or v == 0:
yamldata[k] = _normalize_type_string(v)
else:
if type(v) in (float, int):
@ -806,7 +810,8 @@ def post_parse_yaml_metadata(yamldata):
_flagtype = flagtype(k)
if _flagtype is TYPE_STRING:
build[k] = _normalize_type_string(v)
if v or v == 0:
build[k] = _normalize_type_string(v)
elif _flagtype is TYPE_INT:
build[k] = v
# versionCode must be int