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

backend: cleanup

Browse Source
This commit is contained in:
Dylan Araps 2018-03-31 12:33:52 +11:00
parent 520b065a30
commit 26677bb64b
3 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pywal/backends/colorthief.py
View File

@ -12,10 +12,10 @@ def gen_colors(img):
"""Loop until 16 colors are generated.""" """Loop until 16 colors are generated."""
color_cmd = ColorThief(img).get_palette color_cmd = ColorThief(img).get_palette
for i in range(0, 20, 1): for i in range(0, 10, 1):
raw_colors = color_cmd(color_count=16 + i) raw_colors = color_cmd(color_count=8 + i)
if len(raw_colors) > 16: if len(raw_colors) >= 8:
break break
elif i == 19: elif i == 19:
@ -25,24 +25,28 @@ def gen_colors(img):
else: else:
print("colors: ColorThief couldn't create a suitable palette, " print("colors: ColorThief couldn't create a suitable palette, "
"trying a larger palette size", 16 + i) "trying a larger palette size", 8 + i)
return [util.rgb_to_hex(color) for color in raw_colors] return [util.rgb_to_hex(color) for color in raw_colors]
def adjust(colors, light): def adjust(colors, light):
"""Create palette.""" """Create palette."""
colors.sort(key=util.rgb_to_yiq)
raw_colors = [*colors, *colors]
if light: if light:
print("colors: Colortheif backend doesn't support light themes.") raw_colors[0] = util.lighten_color(colors[0], 0.90)
raw_colors[7] = util.darken_color(colors[0], 0.75)
raw_colors = colors[:1] + colors[8:16] + colors[8:-1] else:
for color in raw_colors:
color = util.lighten_color(color, 0.40)
for color in raw_colors: raw_colors[0] = util.darken_color(colors[0], 0.80)
color = util.lighten_color(color, 0.25) raw_colors[7] = util.lighten_color(colors[0], 0.60)
raw_colors[0] = util.darken_color(colors[0], 0.80) raw_colors[8] = util.lighten_color(colors[0], 0.20)
raw_colors[7] = util.lighten_color(colors[15], 0.60)
raw_colors[8] = util.blend_color(colors[0], colors[15])
raw_colors[15] = raw_colors[7] raw_colors[15] = raw_colors[7]
return raw_colors return raw_colors

22
pywal/backends/colorz.py
View File

@ -14,18 +14,26 @@ def gen_colors(img):
def adjust(colors, light): def adjust(colors, light):
"""Create palette.""" """Create palette."""
if light:
print("colors: Colorz backend doesn't support light themes.")
# Create list with placeholder values. # Create list with placeholder values.
raw_colors = ["#000000", *colors, "#FFFFFF", raw_colors = ["#000000", *colors, "#FFFFFF",
"#333333", *colors, "#FFFFFF"] "#333333", *colors, "#FFFFFF"]
# Update placeholder values. # Update placeholder values.
raw_colors[0] = util.darken_color(colors[0], 0.75) if light:
raw_colors[8] = util.darken_color(colors[0], 0.25) for color in raw_colors:
raw_colors[7] = util.lighten_color(colors[0], 0.75) color = util.saturate_color(color, 0.50)
raw_colors[15] = raw_colors[7] color = util.darken_color(color, 0.4)
raw_colors[0] = util.lighten_color(colors[0], 0.9)
raw_colors[7] = util.darken_color(colors[0], 0.75)
raw_colors[8] = util.darken_color(colors[0], 0.25)
raw_colors[15] = raw_colors[7]
else:
raw_colors[0] = util.darken_color(colors[0], 0.75)
raw_colors[7] = util.lighten_color(colors[0], 0.75)
raw_colors[8] = util.darken_color(colors[0], 0.25)
raw_colors[15] = raw_colors[7]
return raw_colors return raw_colors

5
pywal/util.py
View File

@ -144,6 +144,11 @@ def saturate_color(color, amount):
return rgb_to_hex((int(r), int(g), int(b))) return rgb_to_hex((int(r), int(g), int(b)))
def rgb_to_yiq(color):
"""Sort a list of colors."""
return colorsys.rgb_to_yiq(*hex_to_rgb(color))
def disown(cmd): def disown(cmd):
"""Call a system command in the background, """Call a system command in the background,
disown it and hide it's output.""" disown it and hide it's output."""