kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00
Code Activity

use pyyaml for writing metadata instead of ruamel

Browse Source
This commit is contained in:
Michael Pöhn 2019-03-06 08:42:17 +01:00
parent 81f1bcf752
commit 63afc0acb5
5 changed files with 270 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildserver/provision-apt-get-install
View File

@ -103,7 +103,6 @@ packages="
python3-setuptools python3-setuptools
python3-smmap python3-smmap
python3-yaml python3-yaml
python3-ruamel.yaml
quilt quilt
rsync rsync
scons scons

211
fdroidserver/metadata.py
View File

@ -248,6 +248,13 @@ def fieldtype(name):
return TYPE_STRING return TYPE_STRING
def yml_fieldtype(name):
if name == 'CurrentVersionCode':
return TYPE_INT
else:
return fieldtype(name)
# In the order in which they are laid out on files # In the order in which they are laid out on files
build_flags_order = [ build_flags_order = [
'disable', 'disable',
@ -1115,117 +1122,123 @@ def write_yaml(mf, app):
:param app: app metadata to written to the yaml file :param app: app metadata to written to the yaml file
""" """
# import rumael.yaml and check version def format_yml_field(field, value, typ, width=80, offset=0):
try: # TODO: use CSafeDumper if available
import ruamel.yaml
except ImportError as e:
raise FDroidException('ruamel.yaml not instlled, can not write metadata.') from e
if not ruamel.yaml.__version__:
raise FDroidException('ruamel.yaml.__version__ not accessible. Please make sure a ruamel.yaml >= 0.13 is installed..')
m = re.match(r'(?P<major>[0-9]+)\.(?P<minor>[0-9]+)\.(?P<patch>[0-9]+)(-.+)?',
ruamel.yaml.__version__)
if not m:
raise FDroidException('ruamel.yaml version malfored, please install an upstream version of ruamel.yaml')
if int(m.group('major')) < 0 or int(m.group('minor')) < 13:
raise FDroidException('currently installed version of ruamel.yaml ({}) is too old, >= 1.13 required.'.format(ruamel.yaml.__version__))
# suiteable version ruamel.yaml imported successfully
_yaml_bools_true = ('y', 'Y', 'yes', 'Yes', 'YES', bool_list_hack = ['gradle']
'true', 'True', 'TRUE',
'on', 'On', 'ON')
_yaml_bools_false = ('n', 'N', 'no', 'No', 'NO',
'false', 'False', 'FALSE',
'off', 'Off', 'OFF')
_yaml_bools_plus_lists = []
_yaml_bools_plus_lists.extend(_yaml_bools_true)
_yaml_bools_plus_lists.extend([[x] for x in _yaml_bools_true])
_yaml_bools_plus_lists.extend(_yaml_bools_false)
_yaml_bools_plus_lists.extend([[x] for x in _yaml_bools_false])
def _class_as_dict_representer(dumper, data): data = {}
'''Creates a YAML representation of a App/Build instance''' default_style = None
return dumper.represent_dict(data)
def _field_to_yaml(typ, value): if typ == TYPE_INT:
if typ is TYPE_STRING: data[field] = int(value)
if value in _yaml_bools_plus_lists: elif typ == TYPE_BOOL:
return ruamel.yaml.scalarstring.SingleQuotedScalarString(str(value)) data[field] = bool(value)
return str(value) elif typ == TYPE_SCRIPT:
elif typ is TYPE_INT: if type(value) != list:
return int(value) value = value.split(' && ')
elif typ is TYPE_MULTILINE: if len(value) > 1:
if '\n' in value: data[field] = value
return ruamel.yaml.scalarstring.preserve_literal(str(value))
else: else:
return str(value) data[field] = value[0]
elif typ is TYPE_SCRIPT: elif typ == TYPE_LIST:
if type(value) == list: if field in bool_list_hack:
if len(value) == 1: if value in [True, 'yes', ['yes']]:
return value[0] value = [True]
else: data[field] = value
return value elif typ == TYPE_MULTILINE:
else: default_style = '|'
script_lines = value.split(' && ') data[field] = value.strip()
if len(script_lines) > 1:
return script_lines
else:
return value
else: else:
return value data[field] = value
def _app_to_yaml(app): raw_yml = yaml.dump(data, Dumper=yaml.SafeDumper,
cm = ruamel.yaml.comments.CommentedMap() default_flow_style=False, width=width,
insert_newline = False default_style=default_style, indent=4)
for field in yaml_app_field_order:
if field == '\n': # this is just for debugging purposes remove in production code
# next iteration will need to insert a newline # debug_print_yaml_item(typ, data, default_style, offset, raw_yml)
insert_newline = True
else: if raw_yml:
if app.get(field) or field == 'Builds':
# .txt calls it 'builds' internally, everywhere else its 'Builds' # remove all encapsulation newlines
if field == 'Builds': raw_yml = re.sub('\n+$', '', raw_yml)
if app.get('builds'): raw_yml = re.sub('^\n+', '', raw_yml)
cm.update({field: _builds_to_yaml(app)})
elif field == 'CurrentVersionCode': if offset > 0:
cm.update({field: _field_to_yaml(TYPE_INT, getattr(app, field))}) lines = raw_yml.split('\n')
for i in range(len(lines)):
if lines[i] != '':
lines[i] = ' ' * offset + lines[i]
raw_yml = '\n'.join(lines)
if typ == TYPE_LIST or typ == TYPE_SCRIPT:
# indent sequence items by 2 spaces
new_raw_yml = []
for line in raw_yml.split('\n'):
if re.match(r'^\s*$', line):
new_raw_yml.append('')
elif len(new_raw_yml) > 0:
new_raw_yml.append(' ' + line)
else: else:
cm.update({field: _field_to_yaml(fieldtype(field), getattr(app, field))}) new_raw_yml.append(line)
raw_yml = '\n'.join(new_raw_yml)
elif typ == TYPE_MULTILINE:
# remove quotes from mulit line keys
raw_yml = re.sub(r'^(\s*)"([a-zA-Z0-9]+)":(\s*\|-)$', '\\1\\2:\\3', raw_yml, flags=re.MULTILINE)
if insert_newline: return raw_yml
# we need to prepend a newline in front of this field
insert_newline = False
# inserting empty lines is not supported so we add a
# bogus comment and over-write its value
cm.yaml_set_comment_before_after_key(field, 'bogus')
cm.ca.items[field][1][-1].value = '\n'
return cm
def _builds_to_yaml(app): def format_yml_build_entry(build):
builds = ruamel.yaml.comments.CommentedSeq() result = []
for build in app.builds: for field in build_flags:
b = ruamel.yaml.comments.CommentedMap() value = getattr(build, field, None)
for field in build_flags: if value:
value = getattr(build, field) typ = flagtype(field)
if hasattr(build, field) and value: line = format_yml_field(field, value, typ, width=0xffffffff, offset=4)
if field == 'gradle' and value == ['off']: if re.match(r'^\s+$', line):
value = [ruamel.yaml.scalarstring.SingleQuotedScalarString('off')] result.append('')
if field in ('maven', 'buildozer'): else:
if value == 'no': result.append(line)
continue result[0] = ' - ' + result[0][4:]
elif value == 'yes': return '\n'.join(result)
value = 'yes'
b.update({field: _field_to_yaml(flagtype(field), value)})
builds.append(b)
# insert extra empty lines between build entries result = []
for i in range(1, len(builds)): for field in yaml_app_field_order:
builds.yaml_set_comment_before_after_key(i, 'bogus') if field == '\n':
builds.ca.items[i][1][-1].value = '\n' if result[-1] != '':
result.append('')
continue
else:
value = app.get(field)
if field == 'Builds' and app.builds:
result.append('Builds:')
first_build_entry = True
for build in app.builds:
if first_build_entry:
first_build_entry = False
else:
result.append('')
result.append(format_yml_build_entry(build))
if value:
result.append(format_yml_field(field, value, yml_fieldtype(field)))
mf.write('\n'.join(result))
return builds
yaml_app = _app_to_yaml(app) def debug_print_yaml_item(typ, data, default_style, offset, raw_yml):
ruamel.yaml.round_trip_dump(yaml_app, mf, indent=4, block_seq_indent=2) """function debugging indiviudal lines during yaml writing"""
typTable = {0: 'TYPE_UNKNOWN',
1: 'TYPE_OBSOLETE',
2: 'TYPE_STRING',
3: 'TYPE_BOOL',
4: 'TYPE_LIST',
5: 'TYPE_SCRIPT',
6: 'TYPE_MULTILINE',
7: 'TYPE_BUILD',
8: 'TYPE_INT'}
print('###', '(' + typTable[typ] + ', default_style='
+ str(default_style) + ', offset=' + str(offset) + ')\n',
data, '->', raw_yml if raw_yml else '')
build_line_sep = re.compile(r'(?<!\\),') build_line_sep = re.compile(r'(?<!\\),')

1
setup.py
View File

@ -80,7 +80,6 @@ setup(name='fdroidserver',
'python-vagrant', 'python-vagrant',
'PyYAML', 'PyYAML',
'qrcode', 'qrcode',
'ruamel.yaml >= 0.13',
'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0', 'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
'docker-py >= 1.9, < 2.0', 'docker-py >= 1.9, < 2.0',
], ],

130
tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
View File

@ -199,14 +199,14 @@ Builds:
commit: 0.53-test commit: 0.53-test
submodules: true submodules: true
scandelete: scandelete:
- yes - 'yes'
- versionName: '0.54' - versionName: '0.54'
versionCode: 540 versionCode: 540
commit: '0.54' commit: '0.54'
submodules: true submodules: true
scandelete: scandelete:
- yes - 'yes'
- versionName: '0.55' - versionName: '0.55'
versionCode: 550 versionCode: 550
@ -498,7 +498,7 @@ Builds:
subdir: F-Droid subdir: F-Droid
submodules: true submodules: true
gradle: gradle:
- yes - true
- versionName: 0.95-alpha1 - versionName: 0.95-alpha1
versionCode: 95001 versionCode: 95001
@ -506,7 +506,7 @@ Builds:
subdir: F-Droid subdir: F-Droid
submodules: true submodules: true
gradle: gradle:
- yes - true
- versionName: 0.95-alpha2 - versionName: 0.95-alpha2
versionCode: 95002 versionCode: 95002
@ -514,7 +514,7 @@ Builds:
subdir: F-Droid subdir: F-Droid
submodules: true submodules: true
gradle: gradle:
- yes - true
- versionName: '0.95' - versionName: '0.95'
versionCode: 95050 versionCode: 95050
@ -522,7 +522,7 @@ Builds:
subdir: F-Droid subdir: F-Droid
submodules: true submodules: true
gradle: gradle:
- yes - true
- versionName: 0.95.1 - versionName: 0.95.1
versionCode: 95150 versionCode: 95150
@ -530,56 +530,56 @@ Builds:
subdir: F-Droid subdir: F-Droid
submodules: true submodules: true
gradle: gradle:
- yes - true
- versionName: 0.96-alpha1 - versionName: 0.96-alpha1
versionCode: 96001 versionCode: 96001
commit: v0.96-alpha1 commit: v0.96-alpha1
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.96-alpha2 - versionName: 0.96-alpha2
versionCode: 96002 versionCode: 96002
commit: v0.96-alpha2 commit: v0.96-alpha2
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.96-alpha3 - versionName: 0.96-alpha3
versionCode: 96003 versionCode: 96003
commit: v0.96-alpha3 commit: v0.96-alpha3
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.96-alpha4 - versionName: 0.96-alpha4
versionCode: 96004 versionCode: 96004
commit: v0.96-alpha4 commit: v0.96-alpha4
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.96-alpha5 - versionName: 0.96-alpha5
versionCode: 96005 versionCode: 96005
commit: v0.96-alpha5 commit: v0.96-alpha5
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.96-alpha6 - versionName: 0.96-alpha6
versionCode: 96006 versionCode: 96006
commit: v0.96-alpha6 commit: v0.96-alpha6
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: '0.96' - versionName: '0.96'
versionCode: 96050 versionCode: 96050
commit: v0.96 commit: v0.96
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
scanignore: scanignore:
- extern/AndroidPinning/res/raw/cacerts - extern/AndroidPinning/res/raw/cacerts
@ -588,7 +588,7 @@ Builds:
commit: v0.96.1 commit: v0.96.1
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
scanignore: scanignore:
- extern/AndroidPinning/res/raw/cacerts - extern/AndroidPinning/res/raw/cacerts
@ -597,7 +597,7 @@ Builds:
commit: v0.97-alpha1 commit: v0.97-alpha1
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
scanignore: scanignore:
- extern/AndroidPinning/res/raw/cacerts - extern/AndroidPinning/res/raw/cacerts
@ -606,343 +606,343 @@ Builds:
commit: v0.97-alpha2 commit: v0.97-alpha2
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.97-alpha3 - versionName: 0.97-alpha3
versionCode: 97003 versionCode: 97003
commit: v0.97-alpha3 commit: v0.97-alpha3
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.97-alpha4 - versionName: 0.97-alpha4
versionCode: 97004 versionCode: 97004
commit: v0.97-alpha4 commit: v0.97-alpha4
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.97-alpha5 - versionName: 0.97-alpha5
versionCode: 97005 versionCode: 97005
commit: v0.97-alpha5 commit: v0.97-alpha5
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.97-alpha6 - versionName: 0.97-alpha6
versionCode: 97006 versionCode: 97006
commit: v0.97-alpha6 commit: v0.97-alpha6
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.97-alpha7 - versionName: 0.97-alpha7
versionCode: 97007 versionCode: 97007
commit: v0.97-alpha7 commit: v0.97-alpha7
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.97-alpha8 - versionName: 0.97-alpha8
versionCode: 97008 versionCode: 97008
commit: v0.97-alpha8 commit: v0.97-alpha8
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: '0.97' - versionName: '0.97'
versionCode: 97050 versionCode: 97050
commit: v0.97 commit: v0.97
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.98-alpha1 - versionName: 0.98-alpha1
versionCode: 98001 versionCode: 98001
commit: v0.98-alpha1 commit: v0.98-alpha1
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.98-alpha2 - versionName: 0.98-alpha2
versionCode: 98002 versionCode: 98002
commit: v0.98-alpha2 commit: v0.98-alpha2
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.98-alpha3 - versionName: 0.98-alpha3
versionCode: 98003 versionCode: 98003
commit: v0.98-alpha3 commit: v0.98-alpha3
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.98-alpha4 - versionName: 0.98-alpha4
versionCode: 98004 versionCode: 98004
commit: v0.98-alpha4 commit: v0.98-alpha4
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.98-alpha5 - versionName: 0.98-alpha5
versionCode: 98005 versionCode: 98005
commit: v0.98-alpha5 commit: v0.98-alpha5
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.98-alpha6 - versionName: 0.98-alpha6
versionCode: 98006 versionCode: 98006
commit: v0.98-alpha6 commit: v0.98-alpha6
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.98-alpha7 - versionName: 0.98-alpha7
versionCode: 98007 versionCode: 98007
commit: v0.98-alpha7 commit: v0.98-alpha7
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: '0.98' - versionName: '0.98'
versionCode: 98050 versionCode: 98050
commit: v0.98 commit: v0.98
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.98.1 - versionName: 0.98.1
versionCode: 98150 versionCode: 98150
commit: v0.98.1 commit: v0.98.1
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.99-alpha1 - versionName: 0.99-alpha1
versionCode: 99001 versionCode: 99001
commit: v0.99-alpha1 commit: v0.99-alpha1
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.99-alpha2 - versionName: 0.99-alpha2
versionCode: 99002 versionCode: 99002
commit: v0.99-alpha2 commit: v0.99-alpha2
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: '0.99' - versionName: '0.99'
versionCode: 99050 versionCode: 99050
commit: v0.99 commit: v0.99
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.99.1 - versionName: 0.99.1
versionCode: 99150 versionCode: 99150
commit: v0.99.1 commit: v0.99.1
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.99.2 - versionName: 0.99.2
versionCode: 99250 versionCode: 99250
commit: v0.99.2 commit: v0.99.2
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.100-alpha1 - versionName: 0.100-alpha1
versionCode: 100001 versionCode: 100001
commit: v0.100-alpha1 commit: v0.100-alpha1
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.100-alpha2 - versionName: 0.100-alpha2
versionCode: 100002 versionCode: 100002
commit: v0.100-alpha2 commit: v0.100-alpha2
subdir: F-Droid subdir: F-Droid
gradle: gradle:
- yes - true
- versionName: 0.100-alpha3 - versionName: 0.100-alpha3
versionCode: 100003 versionCode: 100003
commit: v0.100-alpha3 commit: v0.100-alpha3
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.100-alpha4 - versionName: 0.100-alpha4
versionCode: 100004 versionCode: 100004
commit: v0.100-alpha4 commit: v0.100-alpha4
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.100-alpha5 - versionName: 0.100-alpha5
versionCode: 100005 versionCode: 100005
commit: v0.100-alpha5 commit: v0.100-alpha5
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.100-alpha6 - versionName: 0.100-alpha6
versionCode: 100006 versionCode: 100006
commit: v0.100-alpha6 commit: v0.100-alpha6
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.100-alpha7 - versionName: 0.100-alpha7
versionCode: 100007 versionCode: 100007
commit: v0.100-alpha7 commit: v0.100-alpha7
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.100-alpha8 - versionName: 0.100-alpha8
versionCode: 100008 versionCode: 100008
commit: v0.100-alpha8 commit: v0.100-alpha8
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: '0.100' - versionName: '0.100'
versionCode: 100050 versionCode: 100050
commit: v0.100 commit: v0.100
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.100.1 - versionName: 0.100.1
versionCode: 100150 versionCode: 100150
commit: v0.100.1 commit: v0.100.1
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.101-alpha1 - versionName: 0.101-alpha1
versionCode: 101001 versionCode: 101001
commit: v0.101-alpha1 commit: v0.101-alpha1
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.101-alpha2 - versionName: 0.101-alpha2
versionCode: 101002 versionCode: 101002
commit: v0.101-alpha2 commit: v0.101-alpha2
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.101-alpha3 - versionName: 0.101-alpha3
versionCode: 101003 versionCode: 101003
commit: v0.101-alpha3 commit: v0.101-alpha3
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.101-alpha4 - versionName: 0.101-alpha4
versionCode: 101004 versionCode: 101004
commit: v0.101-alpha4 commit: v0.101-alpha4
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.101-alpha5 - versionName: 0.101-alpha5
versionCode: 101005 versionCode: 101005
commit: v0.101-alpha5 commit: v0.101-alpha5
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.101-alpha6 - versionName: 0.101-alpha6
versionCode: 101006 versionCode: 101006
commit: v0.101-alpha6 commit: v0.101-alpha6
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: '0.101' - versionName: '0.101'
versionCode: 101050 versionCode: 101050
commit: v0.101 commit: v0.101
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.102-alpha1 - versionName: 0.102-alpha1
versionCode: 102001 versionCode: 102001
commit: v0.102-alpha1 commit: v0.102-alpha1
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.102-alpha2 - versionName: 0.102-alpha2
versionCode: 102002 versionCode: 102002
commit: v0.102-alpha2 commit: v0.102-alpha2
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.102-alpha3 - versionName: 0.102-alpha3
versionCode: 102003 versionCode: 102003
commit: v0.102-alpha3 commit: v0.102-alpha3
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: '0.102' - versionName: '0.102'
versionCode: 102050 versionCode: 102050
commit: v0.102 commit: v0.102
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.102.1 - versionName: 0.102.1
versionCode: 102150 versionCode: 102150
commit: v0.102.1 commit: v0.102.1
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.102.2 - versionName: 0.102.2
versionCode: 102250 versionCode: 102250
commit: v0.102.2 commit: v0.102.2
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.102.3 - versionName: 0.102.3
versionCode: 102350 versionCode: 102350
commit: v0.102.3 commit: v0.102.3
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.103-alpha1 - versionName: 0.103-alpha1
versionCode: 103001 versionCode: 103001
commit: v0.103-alpha1 commit: v0.103-alpha1
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.103-alpha2 - versionName: 0.103-alpha2
versionCode: 103002 versionCode: 103002
commit: v0.103-alpha2 commit: v0.103-alpha2
subdir: app subdir: app
gradle: gradle:
- yes - true
- versionName: 0.103-alpha3 - versionName: 0.103-alpha3
versionCode: 103003 versionCode: 103003
commit: v0.103-alpha3 commit: v0.103-alpha3
subdir: app subdir: app
gradle: gradle:
- yes - true
ArchivePolicy: 12 versions ArchivePolicy: 12 versions
AutoUpdateMode: None AutoUpdateMode: None

93
tests/metadata.TestCase
View File

@ -307,6 +307,68 @@ class MetadataTest(unittest.TestCase):
'prebuild': "a && b && " 'prebuild': "a && b && "
"sed -i 's,a,b,'"}]}) "sed -i 's,a,b,'"}]})
def test_write_yaml_description_with_trailing_whitespace(self):
mf = io.StringIO()
app = fdroidserver.metadata.App()
app.Categories = ['None']
app.Description = "this evil description has a trailing whitespace "
app.builds = []
build = fdroidserver.metadata.Build()
build.versionCode = 102030
build.versionName = 'v1.2.3'
build.build = "./gradlew compile"
app.builds.append(build)
fdroidserver.metadata.write_yaml(mf, app)
mf.seek(0)
self.maxDiff = None
self.assertEqual(mf.read(), textwrap.dedent("""\
Categories:
- None
License: Unknown
Description: |-
this evil description has a trailing whitespace
Builds:
- versionName: v1.2.3
versionCode: 102030
build: ./gradlew compile
AutoUpdateMode: None
UpdateCheckMode: None
"""))
def test_write_yaml_long_description(self):
mf = io.StringIO()
app = fdroidserver.metadata.App()
app.Categories = ['None']
app.Description = "long description is long; " * 20
app.builds = []
build = fdroidserver.metadata.Build()
build.versionCode = 102030
build.versionName = 'v1.2.3'
build.build = "./gradlew compile"
app.builds.append(build)
fdroidserver.metadata.write_yaml(mf, app)
mf.seek(0)
self.maxDiff = None
self.assertEqual(mf.read(), textwrap.dedent("""\
Categories:
- None
License: Unknown
Description: |-
long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long; long description is long;
Builds:
- versionName: v1.2.3
versionCode: 102030
build: ./gradlew compile
AutoUpdateMode: None
UpdateCheckMode: None
"""))
def test_write_yaml_1_line_scripts_as_string(self): def test_write_yaml_1_line_scripts_as_string(self):
mf = io.StringIO() mf = io.StringIO()
app = fdroidserver.metadata.App() app = fdroidserver.metadata.App()
@ -461,6 +523,37 @@ class MetadataTest(unittest.TestCase):
UpdateCheckMode: None UpdateCheckMode: None
""")) """))
def test_write_yaml_very_long_script(self):
mf = io.StringIO()
app = fdroidserver.metadata.App()
app.Categories = ['None']
app.builds = []
build = fdroidserver.metadata.Build()
build.versionCode = 102030
build.versionName = 'v1.2.3'
build.build = "./gradlew someSpecialTask && sed -i 'd/that wrong config/' gradle.properties && ./gradlew compile && long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long;"
app.builds.append(build)
fdroidserver.metadata.write_yaml(mf, app)
mf.seek(0)
self.maxDiff = None
self.assertEqual(mf.read(), textwrap.dedent("""\
Categories:
- None
License: Unknown
Builds:
- versionName: v1.2.3
versionCode: 102030
build:
- ./gradlew someSpecialTask
- sed -i 'd/that wrong config/' gradle.properties
- ./gradlew compile
- long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long; long script is very long;
AutoUpdateMode: None
UpdateCheckMode: None
"""))
if __name__ == "__main__": if __name__ == "__main__":
os.chdir(os.path.dirname(__file__)) os.chdir(os.path.dirname(__file__))