mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-05 17:01:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

update: skip packages without metadata in index V1

Browse source 
If a package does not have a matching "app" metadata file, then it should
not be added to the index. index V0 already does this properly.
This commit is contained in:
Hans-Christoph Steiner 2017-05-15 20:11:41 +02:00
parent a17b95a860
commit 77a65be9db
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/index.py
View file

@ -169,7 +169,7 @@ def make_v1(apps, packages, repodir, repodict, requestsdict):
appslist = [] appslist = []
output['apps'] = appslist output['apps'] = appslist
for appid, appdict in apps.items(): for packageName, appdict in apps.items():
d = collections.OrderedDict() d = collections.OrderedDict()
appslist.append(d) appslist.append(d)
for k, v in sorted(appdict.items()): for k, v in sorted(appdict.items()):
@ -190,7 +190,7 @@ def make_v1(apps, packages, repodir, repodict, requestsdict):
elif k == 'CurrentVersion': # TODO make SuggestedVersionName the canonical name elif k == 'CurrentVersion': # TODO make SuggestedVersionName the canonical name
k = 'suggestedVersionName' k = 'suggestedVersionName'
elif k == 'AutoName': elif k == 'AutoName':
if 'Name' not in apps[appid]: if 'Name' not in apps[packageName]:
d['name'] = v d['name'] = v
continue continue
else: else:
@ -201,6 +201,9 @@ def make_v1(apps, packages, repodir, repodict, requestsdict):
output['packages'] = output_packages output['packages'] = output_packages
for package in packages: for package in packages:
packageName = package['packageName'] packageName = package['packageName']
if packageName not in apps:
logging.info('Ignoring package without metadata: ' + package['apkName'])
continue
if packageName in output_packages: if packageName in output_packages:
packagelist = output_packages[packageName] packagelist = output_packages[packageName]
else: else: