From 337974cbedf673a528cc6df8b17e0550906b3115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20D=C3=BCster?= Date: Thu, 25 May 2023 19:05:57 +0200 Subject: [PATCH] metadata: Make ArchivePolicy an interger internally --- .gitlab-ci.yml | 1 + fdroidserver/lint.py | 20 +++++++++++++------ fdroidserver/metadata.py | 14 ++++++++----- fdroidserver/update.py | 4 ++-- .../app.with.special.build.params.yml | 2 +- .../org.fdroid.fdroid.yml | 2 +- tests/metadata.TestCase | 2 +- .../app.with.special.build.params.yml | 2 +- .../dump/app.with.special.build.params.yaml | 2 +- tests/metadata/dump/com.politedroid.yaml | 2 +- tests/metadata/dump/org.videolan.vlc.yaml | 2 +- tests/update.TestCase | 2 +- 12 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6193e6ff..636de406 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,6 +57,7 @@ metadata_v0: - cd fdroiddata - ../tests/dump_internal_metadata_format.py - sed -i + -e '/ArchivePolicy:/d' -e '/RequiresRoot:/d' metadata/dump_*/*.yaml - diff -uw metadata/dump_* diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py index ba21295c..0fc4aa5e 100644 --- a/fdroidserver/lint.py +++ b/fdroidserver/lint.py @@ -635,6 +635,17 @@ def check_app_field_types(app): fieldtype=v.__class__.__name__, ) ) + elif t == metadata.TYPE_INT and not isinstance(v, int): + yield ( + _( + "{appid}: {field} must be a '{type}', but it is a '{fieldtype}'!" + ).format( + appid=app.id, + field=field, + type='int', + fieldtype=v.__class__.__name__, + ) + ) def check_antiFeatures(app): @@ -693,8 +704,7 @@ def check_for_unsupported_metadata_files(basedir=""): def check_current_version_code(app): """Check that the CurrentVersionCode is currently available.""" - archive_policy = app.get('ArchivePolicy') - if archive_policy and archive_policy.split()[0] == "0": + if app.get('ArchivePolicy') == 0: return cv = app.get('CurrentVersionCode') if cv is not None and cv == 0: @@ -724,13 +734,11 @@ def check_current_version_code(app): def check_updates_expected(app): """Check if update checking makes sense.""" - if ( - app.get('NoSourceSince') or app.get('ArchivePolicy') == '0 versions' - ) and not all( + if (app.get('NoSourceSince') or app.get('ArchivePolicy') == 0) and not all( app.get(key, 'None') == 'None' for key in ('AutoUpdateMode', 'UpdateCheckMode') ): yield _( - 'App has NoSourceSince or ArchivePolicy "0 versions" but AutoUpdateMode or UpdateCheckMode are not None' + 'App has NoSourceSince or ArchivePolicy "0 versions" or 0 but AutoUpdateMode or UpdateCheckMode are not None' ) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index d41b8fd9..132d2f8c 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -195,6 +195,7 @@ fieldtypes = { 'Builds': TYPE_BUILD, 'VercodeOperation': TYPE_LIST, 'CurrentVersionCode': TYPE_INT, + 'ArchivePolicy': TYPE_INT, } @@ -447,10 +448,6 @@ valuetypes = { r'^[a-fA-F0-9]{64}$', ["AllowedAPKSigningKeys"]), - FieldValidator("Archive Policy", - r'^[0-9]+ versions$', - ["ArchivePolicy"]), - FieldValidator("Auto Update Mode", r"^(Version.*|None)$", ["AutoUpdateMode"]), @@ -1017,6 +1014,9 @@ def post_parse_yaml_metadata(yamldata): if v or v == 0: yamldata[k] = _normalize_type_list(k, v) elif _fieldtype == TYPE_INT: + # ArchivePolicy used to require " versions" in the value. + if k == 'ArchivePolicy' and isinstance(v, str): + v = v.split(' ', maxsplit=1)[0] v = _normalize_type_int(k, v) if v or v == 0: yamldata[k] = v @@ -1210,7 +1210,7 @@ def _app_to_yaml(app): insert_newline = True else: value = app.get(field) - if value or field == 'Builds': + if value or field in ('Builds', 'ArchivePolicy'): _fieldtype = fieldtype(field) if field == 'Builds': if app.get('Builds'): @@ -1226,6 +1226,10 @@ def _app_to_yaml(app): if len(value) == 1: cm[field] = value[0] else: + elif field == 'ArchivePolicy': + if value is None: + continue + cm[field] = _field_to_yaml(fieldtype(field), value) cm[field] = value elif _fieldtype == TYPE_MULTILINE: v = _format_multiline(value) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 398932b4..1fb020ea 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -176,7 +176,7 @@ def status_update_json(apps, apks): validapks = 0 if app.get('Disabled'): output['disabled'].append(appid) - elif app.get("ArchivePolicy") and int(app["ArchivePolicy"][:-9]) == 0: + elif app["ArchivePolicy"] == 0: output['archivePolicy0'].append(appid) else: for build in app.get('Builds', []): @@ -1877,7 +1877,7 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi for appid, app in apps.items(): if app.get('ArchivePolicy'): - keepversions = int(app['ArchivePolicy'][:-9]) + keepversions = app['ArchivePolicy'] else: keepversions = defaultkeepversions if app.get('VercodeOperation'): diff --git a/tests/metadata-rewrite-yml/app.with.special.build.params.yml b/tests/metadata-rewrite-yml/app.with.special.build.params.yml index eeb174b7..1a286a13 100644 --- a/tests/metadata-rewrite-yml/app.with.special.build.params.yml +++ b/tests/metadata-rewrite-yml/app.with.special.build.params.yml @@ -95,7 +95,7 @@ Builds: versionCode: 51 disable: Labelled as pre-release, so skipped -ArchivePolicy: 0 versions +ArchivePolicy: 0 AutoUpdateMode: None UpdateCheckMode: None CurrentVersion: 2.1.2 diff --git a/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml index 9471f9a6..4edb97b7 100644 --- a/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml +++ b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml @@ -944,7 +944,7 @@ Builds: gradle: - yes -ArchivePolicy: 12 versions +ArchivePolicy: 12 AutoUpdateMode: None UpdateCheckMode: Static CurrentVersion: 0.102.3 diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index 064c9ce8..3b1bde45 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -1866,7 +1866,7 @@ class MetadataTest(unittest.TestCase): - NonFreeAssets - UpstreamNonFree - ArchivePolicy: 4 versions + ArchivePolicy: 4 AutoUpdateMode: Version v%v UpdateCheckMode: Tags CurrentVersion: '1.5' diff --git a/tests/metadata/app.with.special.build.params.yml b/tests/metadata/app.with.special.build.params.yml index b2daee52..e07efc2d 100644 --- a/tests/metadata/app.with.special.build.params.yml +++ b/tests/metadata/app.with.special.build.params.yml @@ -94,7 +94,7 @@ Builds: versionCode: 51 disable: Labelled as pre-release, so skipped -ArchivePolicy: 0 versions +ArchivePolicy: 0 AutoUpdateMode: None UpdateCheckMode: None CurrentVersion: 2.1.2 diff --git a/tests/metadata/dump/app.with.special.build.params.yaml b/tests/metadata/dump/app.with.special.build.params.yaml index f53ce361..9698b639 100644 --- a/tests/metadata/dump/app.with.special.build.params.yaml +++ b/tests/metadata/dump/app.with.special.build.params.yaml @@ -1,7 +1,7 @@ AllowedAPKSigningKeys: [] AntiFeatures: UpstreamNonFree: {} -ArchivePolicy: 0 versions +ArchivePolicy: 0 AuthorEmail: null AuthorName: null AuthorWebSite: null diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index e4f24356..7a970436 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -3,7 +3,7 @@ AntiFeatures: NoSourceSince: en-US: '1.5' NonFreeNet: {} -ArchivePolicy: 4 versions +ArchivePolicy: 4 AuthorEmail: null AuthorName: null AuthorWebSite: null diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index f91dfb65..7bcb7dc4 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -1,6 +1,6 @@ AllowedAPKSigningKeys: [] AntiFeatures: {} -ArchivePolicy: 9 versions +ArchivePolicy: 9 AuthorEmail: null AuthorName: null AuthorWebSite: null diff --git a/tests/update.TestCase b/tests/update.TestCase index 7c4e4518..56ad81a7 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -1411,7 +1411,7 @@ class UpdateTest(unittest.TestCase): self.assertDictEqual( metadata_content, { - 'ArchivePolicy': '', + 'ArchivePolicy': None, 'AuthorEmail': '', 'AuthorName': '', 'AuthorWebSite': '',