From 1ede83a0182d2084e08c6ed04c06c00ab457962a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 27 Jun 2017 18:16:54 +1000 Subject: General: Rename file to match others. --- pywal/export_colors.py | 14 ++++---- pywal/format_color.py | 78 --------------------------------------------- pywal/format_colors.py | 78 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_format_colors.py | 14 ++++---- 4 files changed, 92 insertions(+), 92 deletions(-) delete mode 100755 pywal/format_color.py create mode 100755 pywal/format_colors.py diff --git a/pywal/export_colors.py b/pywal/export_colors.py index 93028aa..3a89d22 100755 --- a/pywal/export_colors.py +++ b/pywal/export_colors.py @@ -6,7 +6,7 @@ import subprocess from pywal.settings import CACHE_DIR from pywal import util -from pywal import format_color +from pywal import format_colors def save_colors(colors, export_file, message): @@ -30,25 +30,25 @@ def reload_i3(): def export_colors(colors): """Export colors in various formats.""" - plain_colors = format_color.plain(colors) + plain_colors = format_colors.plain(colors) save_colors(plain_colors, "colors", "plain hex colors") # Shell based colors. - shell_colors = format_color.shell(colors) + shell_colors = format_colors.shell(colors) save_colors(shell_colors, "colors.sh", "shell variables") # Web based colors. - css_colors = format_color.css(colors) + css_colors = format_colors.css(colors) save_colors(css_colors, "colors.css", "css variables") - scss_colors = format_color.scss(colors) + scss_colors = format_colors.scss(colors) save_colors(scss_colors, "colors.scss", "scss variables") # Text editor based colors. - putty_colors = format_color.putty(colors) + putty_colors = format_colors.putty(colors) save_colors(putty_colors, "colors-putty.reg", "putty theme") # X based colors. - xrdb_colors = format_color.xrdb(colors) + xrdb_colors = format_colors.xrdb(colors) save_colors(xrdb_colors, "xcolors", "xrdb colors") # i3 colors. diff --git a/pywal/format_color.py b/pywal/format_color.py deleted file mode 100755 index 5d70ba0..0000000 --- a/pywal/format_color.py +++ /dev/null @@ -1,78 +0,0 @@ -""" -Convert colors to various formats. -""" -from pywal import util - - -def plain(colors): - """Convert colors to plain hex.""" - return [f"{color}\n" for color in colors] - - -def shell(colors): - """Convert colors to shell variables.""" - return [f"color{index}='{color}'\n" - for index, color in enumerate(colors)] - - -def css(colors): - """Convert colors to css variables.""" - css_colors = [":root {\n"] - css_colors.extend([f"\t--color{index}: {color};\n" - for index, color in enumerate(colors)]) - css_colors.append("}\n") - return css_colors - - -def scss(colors): - """Convert colors to scss variables.""" - return [f"$color{index}: {color};\n" - for index, color in enumerate(colors)] - - -def putty(colors): - """Convert colors to putty theme.""" - rgb = util.hex_to_rgb - putty_colors = [ - "Windows Registry Editor Version 5.00\n\n", - "[HKEY_CURRENT_USER\\Software\\SimonTatham\\PuTTY\\Sessions\\Wal]\n", - ] - putty_colors.extend([f"\"colour{index}\"=\"{rgb(color)}\"\n" - for index, color in enumerate(colors)]) - - return putty_colors - - -def xrdb(colors): - """Convert colors to xrdb format.""" - x_colors = [] - x_colors.append(f"URxvt*foreground: {colors[15]}\n") - x_colors.append(f"XTerm*foreground: {colors[15]}\n") - x_colors.append(f"URxvt*background: {colors[0]}\n") - x_colors.append(f"XTerm*background: {colors[0]}\n") - x_colors.append(f"URxvt*cursorColor: {colors[15]}\n") - x_colors.append(f"XTerm*cursorColor: {colors[15]}\n") - - # Colors 0-15. - x_colors.extend([f"*.color{index}: {color}\n*color{index}: {color}\n" - for index, color in enumerate(colors)]) - - x_colors.append(f"*.color66: {colors[0]}\n*color66: {colors[0]}\n") - - # Rofi colors. - x_colors.append(f"rofi.color-window: {colors[0]}, " - f"{colors[0]}, {colors[10]}\n") - x_colors.append(f"rofi.color-normal: {colors[0]}, " - f"{colors[15]}, {colors[0]}, " - f"{colors[10]}, {colors[0]}\n") - x_colors.append(f"rofi.color-active: {colors[0]}, " - f"{colors[15]}, {colors[0]}, " - f"{colors[10]}, {colors[0]}\n") - x_colors.append(f"rofi.color-urgent: {colors[0]}, " - f"{colors[9]}, {colors[0]}, " - f"{colors[9]}, {colors[15]}\n") - - # Emacs colors. - x_colors.append(f"emacs*background: {colors[0]}\n") - x_colors.append(f"emacs*foreground: {colors[15]}\n") - return x_colors diff --git a/pywal/format_colors.py b/pywal/format_colors.py new file mode 100755 index 0000000..5d70ba0 --- /dev/null +++ b/pywal/format_colors.py @@ -0,0 +1,78 @@ +""" +Convert colors to various formats. +""" +from pywal import util + + +def plain(colors): + """Convert colors to plain hex.""" + return [f"{color}\n" for color in colors] + + +def shell(colors): + """Convert colors to shell variables.""" + return [f"color{index}='{color}'\n" + for index, color in enumerate(colors)] + + +def css(colors): + """Convert colors to css variables.""" + css_colors = [":root {\n"] + css_colors.extend([f"\t--color{index}: {color};\n" + for index, color in enumerate(colors)]) + css_colors.append("}\n") + return css_colors + + +def scss(colors): + """Convert colors to scss variables.""" + return [f"$color{index}: {color};\n" + for index, color in enumerate(colors)] + + +def putty(colors): + """Convert colors to putty theme.""" + rgb = util.hex_to_rgb + putty_colors = [ + "Windows Registry Editor Version 5.00\n\n", + "[HKEY_CURRENT_USER\\Software\\SimonTatham\\PuTTY\\Sessions\\Wal]\n", + ] + putty_colors.extend([f"\"colour{index}\"=\"{rgb(color)}\"\n" + for index, color in enumerate(colors)]) + + return putty_colors + + +def xrdb(colors): + """Convert colors to xrdb format.""" + x_colors = [] + x_colors.append(f"URxvt*foreground: {colors[15]}\n") + x_colors.append(f"XTerm*foreground: {colors[15]}\n") + x_colors.append(f"URxvt*background: {colors[0]}\n") + x_colors.append(f"XTerm*background: {colors[0]}\n") + x_colors.append(f"URxvt*cursorColor: {colors[15]}\n") + x_colors.append(f"XTerm*cursorColor: {colors[15]}\n") + + # Colors 0-15. + x_colors.extend([f"*.color{index}: {color}\n*color{index}: {color}\n" + for index, color in enumerate(colors)]) + + x_colors.append(f"*.color66: {colors[0]}\n*color66: {colors[0]}\n") + + # Rofi colors. + x_colors.append(f"rofi.color-window: {colors[0]}, " + f"{colors[0]}, {colors[10]}\n") + x_colors.append(f"rofi.color-normal: {colors[0]}, " + f"{colors[15]}, {colors[0]}, " + f"{colors[10]}, {colors[0]}\n") + x_colors.append(f"rofi.color-active: {colors[0]}, " + f"{colors[15]}, {colors[0]}, " + f"{colors[10]}, {colors[0]}\n") + x_colors.append(f"rofi.color-urgent: {colors[0]}, " + f"{colors[9]}, {colors[0]}, " + f"{colors[9]}, {colors[15]}\n") + + # Emacs colors. + x_colors.append(f"emacs*background: {colors[0]}\n") + x_colors.append(f"emacs*foreground: {colors[15]}\n") + return x_colors diff --git a/tests/test_format_colors.py b/tests/test_format_colors.py index 63c1ce2..ab5946a 100755 --- a/tests/test_format_colors.py +++ b/tests/test_format_colors.py @@ -1,7 +1,7 @@ """Test format functions.""" import unittest -from pywal import format_color +from pywal import format_colors from pywal import util @@ -14,32 +14,32 @@ class TestFormatColors(unittest.TestCase): def test_plain(self): """> Convert colors to plain.""" - result = format_color.plain(COLORS) + result = format_colors.plain(COLORS) self.assertEqual(result[0], "#363442\n") def test_shell(self): """> Convert colors to shell variables.""" - result = format_color.shell(COLORS) + result = format_colors.shell(COLORS) self.assertEqual(result[0], "color0='#363442'\n") def test_css(self): """> Convert colors to css variables.""" - result = format_color.css(COLORS) + result = format_colors.css(COLORS) self.assertEqual(result[1], "\t--color0: #363442;\n") def test_scss(self): """> Convert colors to scss variables.""" - result = format_color.scss(COLORS) + result = format_colors.scss(COLORS) self.assertEqual(result[0], "$color0: #363442;\n") def test_putty(self): """> Convert colors to putty theme.""" - result = format_color.putty(COLORS) + result = format_colors.putty(COLORS) self.assertEqual(result[2], "\"colour0\"=\"54,52,66\"\n") def test_xrdb(self): """> Convert colors to putty theme.""" - result = format_color.xrdb(COLORS) + result = format_colors.xrdb(COLORS) self.assertEqual(result[6], "*.color0: #363442\n*color0: #363442\n") -- cgit v1.2.3