Remove densities getter

This commit is contained in:
Daniel Martí 2015-10-24 16:34:55 +02:00
parent a92f9a3a4c
commit 0fa6aac288

View file

@ -45,9 +45,7 @@ import metadata
from common import FDroidPopen, SdkToolsPopen from common import FDroidPopen, SdkToolsPopen
from metadata import MetaDataException from metadata import MetaDataException
screen_densities = ['640', '480', '320', '240', '160', '120']
def get_densities():
return ['640', '480', '320', '240', '160', '120']
def dpi_to_px(density): def dpi_to_px(density):
@ -65,7 +63,7 @@ def get_icon_dir(repodir, density):
def get_icon_dirs(repodir): def get_icon_dirs(repodir):
for density in get_densities(): for density in screen_densities:
yield get_icon_dir(repodir, density) yield get_icon_dir(repodir, density)
yield os.path.join(repodir, "icons") yield os.path.join(repodir, "icons")
@ -327,7 +325,7 @@ def resize_all_icons(repodirs):
:param repodirs: the repo directories to process :param repodirs: the repo directories to process
""" """
for repodir in repodirs: for repodir in repodirs:
for density in get_densities(): for density in screen_densities:
icon_dir = get_icon_dir(repodir, density) icon_dir = get_icon_dir(repodir, density)
icon_glob = os.path.join(icon_dir, '*.png') icon_glob = os.path.join(icon_dir, '*.png')
for iconpath in glob.glob(icon_glob): for iconpath in glob.glob(icon_glob):
@ -564,9 +562,8 @@ def scan_apks(apps, apkcache, repodir, knownapks):
thisinfo['versioncode']) thisinfo['versioncode'])
# Extract the icon file... # Extract the icon file...
densities = get_densities()
empty_densities = [] empty_densities = []
for density in densities: for density in screen_densities:
if density not in thisinfo['icons_src']: if density not in thisinfo['icons_src']:
empty_densities.append(density) empty_densities.append(density)
continue continue