kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00
Code Activity

Smarter archive policy apk moving

Browse Source 
* Move apks back from the archive repo (e.g. if builds are disabled thus the
  number of apks on the main repo decreases)
* Also move apk signatures back and forth
This commit is contained in:
Daniel Martí 2015-09-30 12:33:01 -07:00
parent 4ea5ce8889
commit 1ed33bfa96
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
fdroidserver/update.py
View File

@ -983,36 +983,50 @@ def archive_old_apks(apps, apks, archapks, repodir, archivedir, defaultkeepversi
for appid, app in apps.iteritems(): for appid, app in apps.iteritems():
# Get a list of the apks for this app...
apklist = []
for apk in apks:
if apk['id'] == appid:
apklist.append(apk)
# Sort the apk list into version order...
apklist = sorted(apklist, key=lambda apk: apk['versioncode'], reverse=True)
if app['Archive Policy']: if app['Archive Policy']:
keepversions = int(app['Archive Policy'][:-9]) keepversions = int(app['Archive Policy'][:-9])
else: else:
keepversions = defaultkeepversions keepversions = defaultkeepversions
if len(apklist) > keepversions: def filter_apk_list_sorted(apk_list):
res = []
for apk in apk_list:
if apk['id'] == appid:
res.append(apk)
# Sort the apk list by version code. First is highest/newest.
return sorted(res, key=lambda apk: apk['versioncode'], reverse=True)
def move_file(from_dir, to_dir, filename, ignore_missing):
from_path = os.path.join(from_dir, filename)
if ignore_missing and not os.path.exists(from_path):
return
to_path = os.path.join(to_dir, filename)
shutil.move(from_path, to_path)
if len(apks) > keepversions:
apklist = filter_apk_list_sorted(apks)
# Move back the ones we don't want.
for apk in apklist[keepversions:]: for apk in apklist[keepversions:]:
logging.info("Moving " + apk['apkname'] + " to archive") logging.info("Moving " + apk['apkname'] + " to archive")
shutil.move(os.path.join(repodir, apk['apkname']), move_file(repodir, archivedir, apk['apkname'], False)
os.path.join(archivedir, apk['apkname']))
if 'srcname' in apk: if 'srcname' in apk:
shutil.move(os.path.join(repodir, apk['srcname']), move_file(repodir, archivedir, apk['srcname'], False)
os.path.join(archivedir, apk['srcname'])) move_file(repodir, archivedir, apk['srcname'] + '.asc', True)
# Move GPG signature too...
sigfile = apk['srcname'] + '.asc'
sigsrc = os.path.join(repodir, sigfile)
if os.path.exists(sigsrc):
shutil.move(sigsrc, os.path.join(archivedir, sigfile))
archapks.append(apk) archapks.append(apk)
apks.remove(apk) apks.remove(apk)
elif len(apks) < keepversions and len(archapks) > 0:
required = keepversions - len(apks)
archapklist = filter_apk_list_sorted(archapks)
# Move forward the ones we want again.
for apk in archapklist[:required]:
logging.info("Moving " + apk['apkname'] + " from archive")
move_file(archivedir, repodir, apk['apkname'], False)
if 'srcname' in apk:
move_file(archivedir, repodir, apk['srcname'], False)
move_file(archivedir, repodir, apk['srcname'] + '.asc', True)
archapks.remove(apk)
apks.append(apk)
def add_apks_to_per_app_repos(repodir, apks): def add_apks_to_per_app_repos(repodir, apks):