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

do not assume app is an App instance, support API usage

Browse source 
When using fdroidserver methods as an API, the full setup might not
have taken place.  `app` instances can always just be a dict, the App
class is mostly just a typing shortcut.  This is incremental, it only
affects a couple of functions in fdroidserver/update.py.
This commit is contained in:
Hans-Christoph Steiner 2020-11-10 16:24:19 +01:00
parent a1df5ef86a
commit 9442a9e614
3 changed files with 65 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdroidserver/update.py
View file

@ -1891,7 +1891,7 @@ def apply_info_from_latest_apk(apps, apks):
bestver = apk['versionCode']
bestapk = apk
if app['NoSourceSince']:
if app.get('NoSourceSince'):
apk['antiFeatures'].add('NoSourceSince')
if not app['added']:
@ -1901,12 +1901,12 @@ def apply_info_from_latest_apk(apps, apks):
if bestver == UNSET_VERSION_CODE:
if app['Name'] is None:
if app.get('Name') is None:
app['Name'] = app['AutoName'] or appid
app['icon'] = None
logging.debug("Application " + appid + " has no packages")
else:
if app['Name'] is None:
if app.get('Name') is None:
app['Name'] = bestapk['name']
app['icon'] = bestapk['icon'] if 'icon' in bestapk else None
if app['CurrentVersionCode'] is None:
@ -2095,10 +2095,10 @@ def read_added_date_from_all_apks(apps, apks):
for apk in apks:
if apk['packageName'] == appid:
if 'added' in apk:
if not app.added or apk['added'] < app.added:
app.added = apk['added']
if not app.lastUpdated or apk['added'] > app.lastUpdated:
app.lastUpdated = apk['added']
if not app.get('added') or apk['added'] < app['added']:
app['added'] = apk['added']
if not app.get('lastUpdated') or apk['added'] > app['lastUpdated']:
app['lastUpdated'] = apk['added']
def read_names_from_apks(apps, apks):