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

colors: Improve background contrast.

Browse Source
This commit is contained in:
Dylan Araps
2017-12-28 18:04:44 +11:00
parent 5dac42696e
commit 293e2c5bfc
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pywal/colors.py
View File

@ -15,11 +15,18 @@ def imagemagick(color_count, img):
"""Call Imagemagick to generate a scheme.""" """Call Imagemagick to generate a scheme."""
if shutil.which("magick"): if shutil.which("magick"):
magick_command = ["magick", "convert"] magick_command = ["magick", "convert"]
else:
elif shutil.which("convert"):
magick_command = ["convert"] magick_command = ["convert"]
colors = subprocess.run([*magick_command, img, "-resize", "25%", else:
"+dither", "-colors", str(color_count), print("error: imagemagick not found, exiting...\n"
"error: wal requires imagemagick to function.")
sys.exit(1)
colors = subprocess.run([*magick_command, img,
"-resize", "25%", "+dither",
"-colors", str(color_count),
"-unique-colors", "txt:-"], "-unique-colors", "txt:-"],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
@ -29,11 +36,6 @@ 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."""
if not shutil.which("convert"):
print("error: imagemagick not found, exiting...\n"
"error: wal requires imagemagick to function.")
sys.exit(1)
raw_colors = imagemagick(color_count, img) raw_colors = imagemagick(color_count, img)
index = 0 index = 0
@ -59,12 +61,12 @@ def gen_colors(img, color_count):
def sort_colors(img, colors): def sort_colors(img, colors):
"""Sort the generated colors and store them in a dict that """Sort the generated colors and store them in a dict that
we will later save in json format.""" we will later save in json format."""
raw_colors = colors[:1] + colors[9:] + colors[8:] raw_colors = colors[:1] + colors[8:] + colors[8:-1]
# Darken the background color if it's too light. # Darken the background color if it's too light.
# The value can be a letter or an int so we treat the # The value can be a letter or an int so we treat the
# entire test as strings. # entire test as strings.
if raw_colors[0][1] not in ["0", "1", "2"]: 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.25)
# Create a comment color from the background. # Create a comment color from the background.