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

Don't crash if the app icons are wrong

Browse Source
This commit is contained in:
Daniel Martí 2014-01-14 10:28:13 +01:00
parent 607736f85d
commit a7f259e7cc
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fdroidserver/update.py
View File

@ -296,7 +296,7 @@ def resize_icon(iconpath, density):
print iconpath, "is small enough:", im.size
except Exception,e:
print "ERROR: Failed resizing {0} - {1}".format(iconpath, e)
print "WARNING: Failed resizing {0} - {1}".format(iconpath, e)
def resize_all_icons(repodirs):
"""Resize all icons that exceed the max size
@ -496,17 +496,20 @@ def scan_apks(apps, apkcache, repodir, knownapks):
iconfile = open(iconpath, 'wb')
iconfile.write(apk.read(iconsrc))
iconfile.close()
im = Image.open(iconpath)
dpi = px_to_dpi(im.size[0])
for density in densities:
if density in thisinfo['icons']:
break
if density == densities[-1] or dpi >= int(density):
thisinfo['icons'][density] = iconfilename
shutil.move(iconpath,
os.path.join(get_icon_dir(repodir, density), iconfilename))
empty_densities.remove(density)
break
try:
im = Image.open(iconpath)
dpi = px_to_dpi(im.size[0])
for density in densities:
if density in thisinfo['icons']:
break
if density == densities[-1] or dpi >= int(density):
thisinfo['icons'][density] = iconfilename
shutil.move(iconpath,
os.path.join(get_icon_dir(repodir, density), iconfilename))
empty_densities.remove(density)
break
except Exception,e:
print "WARNING: Failed reading {0} - {1}".format(iconpath, e)
if thisinfo['icons']:
thisinfo['icon'] = iconfilename