mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle APKs with filenames encoded with CP437

Browse source 
The ZIP format has no official encoding :-| so we have to do hacks.  The
zipfile devs couldn't even sort this out:
https://bugs.python.org/issue10614

closes #167
This commit is contained in:
Hans-Christoph Steiner 2016-06-23 17:58:25 +02:00
parent 1be263e870
commit d522bb7e17
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fdroidserver/update.py
View file

@ -411,6 +411,14 @@ def getsig(apkpath):
return hashlib.md5(hexlify(cert_encoded)).hexdigest() return hashlib.md5(hexlify(cert_encoded)).hexdigest()
def get_icon_bytes(apkzip, iconsrc):
'''ZIP has no official encoding, UTF-* and CP437 are defacto'''
try:
return apkzip.read(iconsrc)
except KeyError:
return apkzip.read(iconsrc.encode('utf-8').decode('cp437'))
def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False): def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False):
"""Scan the apks in the given repo directory. """Scan the apks in the given repo directory.
@ -613,7 +621,7 @@ def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False):
try: try:
with open(icondest, 'wb') as f: with open(icondest, 'wb') as f:
f.write(apkzip.read(iconsrc)) f.write(get_icon_bytes(apkzip, iconsrc))
apk['icons'][density] = iconfilename apk['icons'][density] = iconfilename
except: except:
@ -627,7 +635,7 @@ def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False):
iconpath = os.path.join( iconpath = os.path.join(
get_icon_dir(repodir, '0'), iconfilename) get_icon_dir(repodir, '0'), iconfilename)
with open(iconpath, 'wb') as f: with open(iconpath, 'wb') as f:
f.write(apkzip.read(iconsrc)) f.write(get_icon_bytes(apkzip, iconsrc))
try: try:
im = Image.open(iconpath) im = Image.open(iconpath)
dpi = px_to_dpi(im.size[0]) dpi = px_to_dpi(im.size[0])