Read only metadata of apps given on the command line

examples/fdroid_fetchsrclibs.py

@@ -20,9 +20,7 @@ def main():
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     common.options = options
-    pkgs = common.read_pkg_args(options.appid, True)
-    allapps = metadata.read_metadata(pkgs)
-    apps = common.read_app_args(options.appid, allapps, True)
+    apps = common.read_app_args(options.appid, allow_vercodes=True)
     common.read_config(options)
     srclib_dir = os.path.join('build', 'srclib')
     os.makedirs(srclib_dir, exist_ok=True)

fdroidserver/build.py

@@ -968,10 +968,7 @@ def main():
     srclib_dir = os.path.join(build_dir, 'srclib')
     extlib_dir = os.path.join(build_dir, 'extlib')
 
-    # Read all app and srclib metadata
-    pkgs = common.read_pkg_args(options.appid, True)
-    allapps = metadata.read_metadata(pkgs, sort_by_time=True)
-    apps = common.read_app_args(options.appid, allapps, True)
+    apps = common.read_app_args(options.appid, allow_vercodes=True, sort_by_time=True)
 
     for appid, app in list(apps.items()):
         if (app.get('Disabled') and not options.force) or not app.get('RepoType') or not app.get('Builds', []):

fdroidserver/checkupdates.py

@@ -725,10 +725,7 @@ def main():
             logging.error(_('Build metadata git repo has uncommited changes!'))
             sys.exit(1)
 
-    # Get all apps...
-    allapps = metadata.read_metadata()
-
-    apps = common.read_app_args(options.appid, allapps, False)
+    apps = common.read_app_args(options.appid)
 
     processed = []
     failed = dict()

fdroidserver/common.py

@@ -847,7 +847,7 @@ def get_metadata_files(vercodes):
     return metadatafiles
 
 
-def read_app_args(appid_versionCode_pairs, allapps, allow_vercodes=False):
+def read_app_args(appid_versionCode_pairs, allow_vercodes=False, sort_by_time=False):
     """Build a list of App instances for processing.
 
     On top of what read_pkg_args does, this returns the whole app
@@ -858,6 +858,7 @@ def read_app_args(appid_versionCode_pairs, allapps, allow_vercodes=False):
 
     """
     vercodes = read_pkg_args(appid_versionCode_pairs, allow_vercodes)
+    allapps = fdroidserver.metadata.read_metadata(appid_versionCode_pairs, sort_by_time)
 
     if not vercodes:
         return allapps

fdroidserver/lint.py

@@ -843,9 +843,7 @@ def main():
 
 
 def lint_metadata(options):
-    # Get all apps...
-    allapps = metadata.read_metadata(options.appid)
-    apps = common.read_app_args(options.appid, allapps, False)
+    apps = common.read_app_args(options.appid)
 
     anywarns = check_for_unsupported_metadata_files()
 

fdroidserver/rewritemeta.py

@@ -82,9 +82,7 @@ def main():
 
     config = common.read_config(options)
 
-    # Get all apps...
-    allapps = metadata.read_metadata(options.appid)
-    apps = common.read_app_args(options.appid, allapps, False)
+    apps = common.read_app_args(options.appid)
 
     for appid, app in apps.items():
         path = Path(app.metadatapath)

fdroidserver/scanner.py

@@ -826,10 +826,7 @@ def main():
             sys.exit(ExitCode.NONFREE_CODE)
         return
 
-    # Read all app and srclib metadata
-
-    allapps = metadata.read_metadata()
-    apps = common.read_app_args(appids, allapps, True)
+    apps = common.read_app_args(appids, allow_vercodes=True)
 
     build_dir = 'build'
     if not os.path.isdir(build_dir):

tests/scanner.TestCase

@@ -14,7 +14,6 @@ import unittest
 import uuid
 import yaml
 import zipfile
-import collections
 import pathlib
 from unittest import mock
 from dataclasses import asdict
@@ -736,7 +735,7 @@ class Test_main(unittest.TestCase):
 
             self.exit_func.assert_not_called()
             self.read_app_args_func.assert_called_once_with(
-                ['com.example.app'], collections.OrderedDict(), True
+                ['com.example.app'], allow_vercodes=True
             )
             self.scan_binary_func.assert_not_called()