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

colors: Only check for imagemagick once.

Browse Source
This commit is contained in:
Dylan Araps 2018-01-01 11:24:53 +11:00
parent 6cea6bd46f
commit 7984fd40af
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pywal/colors.py
View File

@ -11,19 +11,8 @@ from .settings import CACHE_DIR, COLOR_COUNT
from . import util from . import util
def imagemagick(color_count, img): def imagemagick(color_count, img, magick_command):
"""Call Imagemagick to generate a scheme.""" """Call Imagemagick to generate a scheme."""
if shutil.which("magick"):
magick_command = ["magick", "convert"]
elif shutil.which("convert"):
magick_command = ["convert"]
else:
print("error: imagemagick not found, exiting...\n"
"error: wal requires imagemagick to function.")
sys.exit(1)
colors = subprocess.run([*magick_command, img, colors = subprocess.run([*magick_command, img,
"-resize", "25%", "+dither", "-resize", "25%", "+dither",
"-colors", str(color_count), "-colors", str(color_count),
@ -36,12 +25,23 @@ def imagemagick(color_count, img):
def gen_colors(img, color_count): def gen_colors(img, color_count):
"""Format the output from imagemagick into a list """Format the output from imagemagick into a list
of hex colors.""" of hex colors."""
raw_colors = imagemagick(color_count, img) if shutil.which("magick"):
magick_command = ["magick", "convert"]
elif shutil.which("convert"):
magick_command = ["convert"]
else:
print("error: imagemagick not found, exiting...\n"
"error: wal requires imagemagick to function.")
sys.exit(1)
raw_colors = imagemagick(color_count, img, magick_command)
index = 0 index = 0
while len(raw_colors) - 1 < color_count: while len(raw_colors) - 1 < color_count:
index += 1 index += 1
raw_colors = imagemagick(color_count + index, img) raw_colors = imagemagick(color_count + index, img, magick_command)
print("colors: Imagemagick couldn't generate a", color_count, print("colors: Imagemagick couldn't generate a", color_count,
"color palette, trying a larger palette size", "color palette, trying a larger palette size",