From 4d0a21f3362238602806b8d93f028b388fc11334 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Tue, 19 Jul 2022 13:41:24 +0200 Subject: [PATCH] Use vercodes in read_metadata interface read_metadata is only called in read_app_args with an argument. As vercodes is already there, drop the duplicate call. --- fdroidserver/common.py | 2 +- fdroidserver/metadata.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index fe00e7a9..ca89dbed 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -950,7 +950,7 @@ def read_app_args(appid_versionCode_pairs, allow_version_codes=False, sort_by_ti """ vercodes = read_pkg_args(appid_versionCode_pairs, allow_version_codes) - allapps = fdroidserver.metadata.read_metadata(appid_versionCode_pairs, sort_by_time) + allapps = fdroidserver.metadata.read_metadata(vercodes, sort_by_time) if not vercodes: return allapps diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 1ebbe731..93138954 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -545,7 +545,7 @@ def read_srclibs(): srclibs[metadatapath.stem] = parse_yaml_srclib(metadatapath) -def read_metadata(appids={}, sort_by_time=False): +def read_metadata(appid_to_vercode={}, sort_by_time=False): """Return a list of App instances sorted newest first. This reads all of the metadata files in a 'data' repository, then @@ -553,7 +553,7 @@ def read_metadata(appids={}, sort_by_time=False): sorted based on creation time, newest first. Most of the time, the newer files are the most interesting. - appids is a dict with appids a keys and versionCodes as values. + appid_to_vercode is a dict with appids a keys and versionCodes as values. """ # Always read the srclibs before the apps, since they can use a srlib as @@ -565,9 +565,8 @@ def read_metadata(appids={}, sort_by_time=False): for basedir in ('metadata', 'tmp'): Path(basedir).mkdir(exist_ok=True) - if appids: - vercodes = common.read_pkg_args(appids) - metadatafiles = common.get_metadata_files(vercodes) + if appid_to_vercode: + metadatafiles = common.get_metadata_files(appid_to_vercode) else: metadatafiles = list(Path('metadata').glob('*.yml')) + list( Path('.').glob('.fdroid.yml')