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

choose best apk version vor index v0

Browse source
This commit is contained in:
Michael Pöhn 2017-08-09 17:14:51 +02:00
parent 6930edf889
commit 6fc968f7cd
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
fdroidserver/index.py
View file

@ -354,6 +354,8 @@ def make_v0(apps, apks, repodir, repodict, requestsdict):
root.appendChild(element)
element.setAttribute('packageName', packageName)
fdroid_signed = load_sigkeys(repodir)
for appid, appdict in apps.items():
app = metadata.App(appdict)
@ -362,12 +364,27 @@ def make_v0(apps, apks, repodir, repodict, requestsdict):
# Get a list of the apks for this app...
apklist = []
versionCodes = []
apksbyversion = collections.defaultdict(lambda: [])
for apk in apks:
if apk['packageName'] == appid:
if apk['versionCode'] not in versionCodes:
apklist.append(apk)
versionCodes.append(apk['versionCode'])
if apk.get('versionCode') and apk.get('packageName') == appid:
apksbyversion[apk['versionCode']].append(apk)
for versionCode, apksforver in apksbyversion.items():
fdroidsig = fdroid_signed.get(appid, {}).get('signer')
fdroid_signed_apk = None
name_match_apk = None
for x in apksforver:
if fdroidsig and x.get('signer', None) == fdroidsig:
fdroid_signed_apk = x
if common.apk_release_filename.match(x.get('apkName', '')):
name_match_apk = x
# choose which of the available versions is most
# suiteable for index v0
if fdroid_signed_apk:
apklist.append(fdroid_signed_apk)
elif name_match_apk:
apklist.append(name_match_apk)
else:
apklist.append(apksforver[0])
if len(apklist) == 0:
continue