extern/pywal
1
0
Fork 0
mirror of https://github.com/dylanaraps/pywal.git synced 2025-02-18 03:01:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

colors: Only call imagemagick once.

Browse Source
This commit is contained in:
Dylan Araps 2018-05-29 07:57:52 +10:00
parent c6c3b012be
commit 1ef4c742a2
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pywal/backends/wal.py
View File

@ -35,21 +35,12 @@ def has_im():
def gen_colors(img): def gen_colors(img):
"""Format the output from imagemagick into a list """Format the output from imagemagick into a list
of hex colors.""" of hex colors."""
magick_command = has_im() raw_colors = imagemagick(20, img, has_im())
for i in range(0, 20, 1): if len(raw_colors) < 16:
raw_colors = imagemagick(16 + i, img, magick_command) logging.error("Imagemagick couldn't generate a palette.")
logging.error("Try a different image or backend.")
if len(raw_colors) > 16: sys.exit(1)
break
elif i == 19:
logging.error("Imagemagick couldn't generate a suitable palette.")
sys.exit(1)
else:
logging.warning("Imagemagick couldn't generate a palette.")
logging.warning("Trying a larger palette size %s", 16 + i)
return [re.search("#.{6}", str(col)).group(0) for col in raw_colors[1:]] return [re.search("#.{6}", str(col)).group(0) for col in raw_colors[1:]]
@ -72,7 +63,7 @@ def adjust(colors, light):
else: else:
# Darken the background color slightly. # Darken the background color slightly.
if raw_colors[0][1] != "0": if raw_colors[0][1] != "0":
raw_colors[0] = util.darken_color(raw_colors[0], 0.25) raw_colors[0] = util.darken_color(raw_colors[0], 0.40)
raw_colors[7] = util.blend_color(raw_colors[7], "#EEEEEE") raw_colors[7] = util.blend_color(raw_colors[7], "#EEEEEE")
raw_colors[8] = util.darken_color(raw_colors[7], 0.30) raw_colors[8] = util.darken_color(raw_colors[7], 0.30)