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

Avoid possible crashes

Browse Source 
* No 160 dpi icon available
* Trying to resize a non-existing icon
* Non-dpi icon being lower density than ldpi
This commit is contained in:
Daniel Martí 2014-01-07 17:02:59 +01:00
parent 92cab50368
commit bce5f45169
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fdroidserver/update.py
View File

@ -278,6 +278,9 @@ def delete_disabled_builds(apps, apkcache, repodirs):
def resize_icon(iconpath, density):
if not os.path.isfile(iconpath):
return
try:
im = Image.open(iconpath)
size = dpi_to_px(density)
@ -498,7 +501,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
for density in densities:
if density in thisinfo['icons']:
break
if dpi >= int(density):
if density == densities[-1] or dpi >= int(density):
thisinfo['icons'][density] = iconfilename
shutil.move(iconpath,
os.path.join(get_icon_dir(repodir, density), iconfilename))
@ -554,9 +557,10 @@ def scan_apks(apps, apkcache, repodir, knownapks):
resize_icon(icondest, density)
# Copy from icons-mdpi to icons since mdpi is the baseline density
shutil.copyfile(
os.path.join(get_icon_dir(repodir, '160'), iconfilename),
os.path.join(get_icon_dir(repodir, None), iconfilename))
baseline = os.path.join(get_icon_dir(repodir, '160'), iconfilename)
if os.path.isfile(baseline):
shutil.copyfile(baseline,
os.path.join(get_icon_dir(repodir, None), iconfilename))
# Record in known apks, getting the added date at the same time..
added = knownapks.recordapk(thisinfo['apkname'], thisinfo['id'])