chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1f2b95c
)
Create icons dicts like the rest
author
Daniel Martí
<mvdan@mvdan.cc>
Tue, 7 Jan 2014 15:34:24 +0000
(16:34 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Thu, 9 Jan 2014 15:23:49 +0000
(16:23 +0100)
fdroidserver/update.py
patch
|
blob
|
history
diff --git
a/fdroidserver/update.py
b/fdroidserver/update.py
index 6ce6b2aa369d2092557013d9e9692b4d8266768c..b786ed9b899d3816cbe7da69301ba3e1a0b4a7e6 100644
(file)
--- a/
fdroidserver/update.py
+++ b/
fdroidserver/update.py
@@
-361,6
+361,8
@@
def scan_apks(apps, apkcache, repodir, knownapks):
thisinfo['size'] = os.path.getsize(apkfile)
thisinfo['permissions'] = []
thisinfo['features'] = []
thisinfo['size'] = os.path.getsize(apkfile)
thisinfo['permissions'] = []
thisinfo['features'] = []
+ thisinfo['icons_src'] = {}
+ thisinfo['icons'] = {}
p = subprocess.Popen([os.path.join(config['sdk_path'], 'build-tools', config['build_tools'], 'aapt'),
'dump', 'badging', apkfile],
stdout=subprocess.PIPE)
p = subprocess.Popen([os.path.join(config['sdk_path'], 'build-tools', config['build_tools'], 'aapt'),
'dump', 'badging', apkfile],
stdout=subprocess.PIPE)
@@
-380,23
+382,17
@@
def scan_apks(apps, apkcache, repodir, knownapks):
sys.exit(1)
elif line.startswith("application:"):
thisinfo['name'] = re.match(label_pat, line).group(1)
sys.exit(1)
elif line.startswith("application:"):
thisinfo['name'] = re.match(label_pat, line).group(1)
- if 'icons_src' not in thisinfo:
- thisinfo['icons_src'] = {}
# Keep path to non-dpi icon in case we need it
match = re.match(icon_pat_nodpi, line)
if match:
thisinfo['icons_src']['-1'] = match.group(1)
elif line.startswith("launchable-activity:"):
# Keep path to non-dpi icon in case we need it
match = re.match(icon_pat_nodpi, line)
if match:
thisinfo['icons_src']['-1'] = match.group(1)
elif line.startswith("launchable-activity:"):
- if 'icons_src' not in thisinfo:
- thisinfo['icons_src'] = {}
# Only use launchable-activity as fallback to application
# Only use launchable-activity as fallback to application
-
el
if '-1' not in thisinfo['icons_src']:
+ if '-1' not in thisinfo['icons_src']:
match = re.match(icon_pat_nodpi, line)
if match:
thisinfo['icons_src']['-1'] = match.group(1)
elif line.startswith("application-icon-"):
match = re.match(icon_pat_nodpi, line)
if match:
thisinfo['icons_src']['-1'] = match.group(1)
elif line.startswith("application-icon-"):
- if 'icons_src' not in thisinfo:
- thisinfo['icons_src'] = {}
match = re.match(icon_pat, line)
if match:
density = match.group(1)
match = re.match(icon_pat, line)
if match:
density = match.group(1)
@@
-471,8
+467,6
@@
def scan_apks(apps, apkcache, repodir, knownapks):
if density not in thisinfo['icons_src']:
empty_densities.append(density)
continue
if density not in thisinfo['icons_src']:
empty_densities.append(density)
continue
- if 'icons' not in thisinfo:
- thisinfo['icons'] = {}
iconsrc = thisinfo['icons_src'][density]
icon_dir = get_icon_dir(repodir, density)
icondest = os.path.join(icon_dir, iconfilename)
iconsrc = thisinfo['icons_src'][density]
icon_dir = get_icon_dir(repodir, density)
icondest = os.path.join(icon_dir, iconfilename)
@@
-491,6
+485,9
@@
def scan_apks(apps, apkcache, repodir, knownapks):
resize_icon(icondest, density)
resize_icon(icondest, density)
+ if '-1' in thisinfo['icons_src']:
+ pass #TODO
+
apk.close()
# First try resizing down to not lose quality
apk.close()
# First try resizing down to not lose quality