From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 7 Jan 2014 15:17:38 +0000 (+0100)
Subject: Keep the same ZipFile instance to retrieve all the icons
X-Git-Tag: 0.1~23^2~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d9d8448035fbd9a528205bb18721371e53331b9f;p=fdroidserver.git

Keep the same ZipFile instance to retrieve all the icons
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 4a86611b..67088b6e 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -458,6 +458,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 sys.exit(1)
             thisinfo['sig'] = output[7:].strip()
 
+            apk = zipfile.ZipFile(apkfile, 'r')
+
             iconfilename = "%s.%s.png" % (
                     thisinfo['id'],
                     thisinfo['versioncode'])
@@ -469,7 +471,6 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 if density not in thisinfo['icons_src']:
                     empty_densities.append(density)
                     continue
-                apk = zipfile.ZipFile(apkfile, 'r')
                 if 'icons' not in thisinfo:
                     thisinfo['icons'] = {}
                 iconsrc = thisinfo['icons_src'][density]
@@ -488,10 +489,10 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                     del thisinfo['icons_src'][density]
                     empty_densities.append(density)
 
-                apk.close()
-
                 resize_icon(icondest, density)
 
+            apk.close()
+
             # First try resizing down to not lose quality
             last_density = None
             for density in densities: