diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | pywal/__main__.py | 5 | ||||
| -rw-r--r-- | pywal/colors.py | 26 | ||||
| -rw-r--r-- | pywal/export.py | 17 | ||||
| -rw-r--r-- | pywal/image.py | 15 | ||||
| -rw-r--r-- | pywal/reload.py | 19 | ||||
| -rw-r--r-- | pywal/sequences.py | 27 | ||||
| -rw-r--r-- | pywal/settings.py | 8 | ||||
| -rw-r--r-- | pywal/util.py | 15 | ||||
| -rw-r--r-- | pywal/wallpaper.py | 6 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rwxr-xr-x | tests/test_export.py | 29 | ||||
| -rw-r--r-- | tests/test_main.py | 5 | ||||
| -rwxr-xr-x | tests/test_sequences.py | 9 | ||||
| -rwxr-xr-x | tests/test_util.py | 14 |
15 files changed, 102 insertions, 96 deletions
diff --git a/.travis.yml b/.travis.yml index 36c9a18..1c9b3d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: python python: + - "3.5" - "3.6" before_install: diff --git a/pywal/__main__.py b/pywal/__main__.py index 3b63464..cbb0ba6 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -87,14 +87,15 @@ def process_args(args): sys.exit(1) if args.v: - print(f"wal {__version__}") + print("wal", __version__) sys.exit(0) if args.q: sys.stdout = sys.stderr = open(os.devnull, "w") if args.c: - shutil.rmtree(CACHE_DIR / "schemes", ignore_errors=True) + scheme_dir = os.path.join(CACHE_DIR, "schemes") + shutil.rmtree(scheme_dir, ignore_errors=True) if args.r: reload.colors(args.t) diff --git a/pywal/colors.py b/pywal/colors.py index 2483acd..fd233c5 100644 --- a/pywal/colors.py +++ b/pywal/colors.py @@ -1,6 +1,7 @@ """ Generate a colorscheme using imagemagick. """ +import os import re import shutil import subprocess @@ -64,19 +65,17 @@ def sort_colors(img, colors): # Create a comment color from the background. raw_colors[8] = util.lighten_color(raw_colors[0], 0.40) - colors = {"wallpaper": img} - colors_special = {} - colors_hex = {} + colors = {} + colors["wallpaper"] = img + colors["special"] = {} + colors["colors"] = {} - colors_special.update({"background": raw_colors[0]}) - colors_special.update({"foreground": raw_colors[15]}) - colors_special.update({"cursor": raw_colors[15]}) + colors["special"]["background"] = raw_colors[0] + colors["special"]["foreground"] = raw_colors[15] + colors["special"]["cursor"] = raw_colors[15] for index, color in enumerate(raw_colors): - colors_hex.update({f"color{index}": color}) - - colors["special"] = colors_special - colors["colors"] = colors_hex + colors["colors"]["color%s" % index] = color return colors @@ -85,11 +84,10 @@ def get(img, cache_dir=CACHE_DIR, color_count=COLOR_COUNT, notify=False): """Get the colorscheme.""" # _home_dylan_img_jpg.json - cache_file = cache_dir / "schemes" / \ - img.replace("/", "_").replace(".", "_") - cache_file = cache_file.with_suffix(".json") + cache_file = img.replace("/", "_").replace(".", "_") + cache_file = os.path.join(cache_dir, "schemes", cache_file + ".json") - if cache_file.is_file(): + if os.path.isfile(cache_file): colors = util.read_file_json(cache_file) print("colors: Found cached colorscheme.") diff --git a/pywal/export.py b/pywal/export.py index 748e3a9..d2db143 100644 --- a/pywal/export.py +++ b/pywal/export.py @@ -2,7 +2,6 @@ Export colors in various formats. """ import os -import pathlib from .settings import CACHE_DIR, MODULE_DIR from . import util @@ -43,10 +42,10 @@ def get_export_type(export_type): def every(colors, output_dir=CACHE_DIR): """Export all template files.""" all_colors = flatten_colors(colors) - output_dir = pathlib.Path(output_dir) + template_dir = os.path.join(MODULE_DIR, "templates") - for file in os.scandir(MODULE_DIR / "templates"): - template(all_colors, file.path, output_dir / file.name) + for file in os.scandir(template_dir): + template(all_colors, file.path, os.path.join(output_dir, file.name)) print("export: Exported all files.") @@ -56,11 +55,11 @@ def color(colors, export_type, output_file=None): all_colors = flatten_colors(colors) template_name = get_export_type(export_type) - template_file = MODULE_DIR / "templates" / template_name - output_file = output_file or CACHE_DIR / template_name + template_file = os.path.join(MODULE_DIR, "templates", template_name) + output_file = output_file or os.path.join(CACHE_DIR, template_name) - if template_file.is_file(): + if os.path.isfile(template_file): template(all_colors, template_file, output_file) - print(f"export: Exported {export_type}.") + print("export: Exported %s." % export_type) else: - print(f"[!] warning: template '{export_type}' doesn't exist.") + print("warning: template '%s' doesn't exist." % export_type) diff --git a/pywal/image.py b/pywal/image.py index 787bb80..bb495b1 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -2,7 +2,6 @@ Get the image file. """ import os -import pathlib import random import sys @@ -24,25 +23,23 @@ def get_random_image(img_dir): print("image: No new images found (nothing to do), exiting...") sys.exit(1) - return str(img_dir / random.choice(images).name) + return os.path.join(img_dir, random.choice(images).name) def get(img, cache_dir=CACHE_DIR): """Validate image input.""" - image = pathlib.Path(img) + if os.path.isfile(img): + wal_img = img - if image.is_file(): - wal_img = str(image) - - elif image.is_dir(): - wal_img = get_random_image(image) + elif os.path.isdir(img): + wal_img = get_random_image(img) else: print("error: No valid image file found.") sys.exit(1) # Cache the image file path. - util.save_file(wal_img, cache_dir / "wal") + util.save_file(wal_img, os.path.join(cache_dir, "wal")) print("image: Using image", wal_img) return wal_img diff --git a/pywal/reload.py b/pywal/reload.py index f284966..3f46004 100644 --- a/pywal/reload.py +++ b/pywal/reload.py @@ -1,6 +1,7 @@ """ Reload programs. """ +import os import re import shutil import subprocess @@ -12,7 +13,7 @@ from . import util def xrdb(xrdb_file=None): """Merge the colors into the X db so new terminals use them.""" - xrdb_file = xrdb_file or CACHE_DIR / "colors.Xresources" + xrdb_file = xrdb_file or os.path.join(CACHE_DIR, "colors.Xresources") if shutil.which("xrdb"): subprocess.Popen(["xrdb", "-merge", xrdb_file], @@ -22,18 +23,18 @@ def xrdb(xrdb_file=None): def gtk(): """Move gtkrc files to the correct location.""" - theme_path = HOME / ".themes" / "Flatabulous-wal" - gtk2_file = CACHE_DIR / "colors-gtk2.rc" + theme_path = os.path.join(HOME, ".themes", "Flatabulous-wal") + gtk2_file = os.path.join(CACHE_DIR, "colors-gtk2.rc") - if theme_path.is_dir(): - if gtk2_file.is_file(): - shutil.copy(gtk2_file, theme_path / "gtk-2.0") + if os.path.isdir(theme_path): + shutil.copy(gtk2_file, os.path.join(theme_path, "gtk-2.0")) # Here we call a Python 2 script to reload the GTK themes. # This is done because the Python 3 GTK/Gdk libraries don't # provide a way of doing this. if shutil.which("python2"): - util.disown(["python2", MODULE_DIR / "scripts" / "gtk_reload.py"]) + gtk_reload = os.path.join(MODULE_DIR, "scripts", "gtk_reload.py") + util.disown(["python2", gtk_reload]) else: print("warning: GTK2 reload support requires Python 2.") @@ -62,9 +63,9 @@ def env(xrdb_file=None): def colors(vte, cache_dir=CACHE_DIR): """Reload the current scheme.""" - sequence_file = cache_dir / "sequences" + sequence_file = os.path.join(cache_dir, "sequences") - if sequence_file.is_file(): + if os.path.isfile(sequence_file): sequences = "".join(util.read_file(sequence_file)) # If vte mode was used, remove the unsupported sequence. diff --git a/pywal/sequences.py b/pywal/sequences.py index b94bd93..67c3efd 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -2,6 +2,7 @@ Send sequences to all open terminals. """ import glob +import os from .settings import CACHE_DIR, OS from . import util @@ -12,37 +13,37 @@ def set_special(index, color, iterm_name="h"): alpha = util.Color.alpha_num if OS == "Darwin": - return f"\033]P{iterm_name}{color.strip('#')}\033\\" + return "\033[P%s%s\033\\" % (iterm_name, color.strip("#")) if index in [11, 708] and alpha != 100: - return f"\033]{index};[{alpha}]{color}\007" + return "\033]%s;[%s]%s\007" % (index, alpha, color) - return f"\033]{index};{color}\007" + return "\033]%s;%s\007" % (index, color) def set_color(index, color): """Convert a hex color to a text color sequence.""" if OS == "Darwin": - return f"\033]P{index:x}{color.strip('#')}\033\\" + return "\033]P%x%s\033\\" % (index, color.strip("#")) - return f"\033]4;{index};{color}\007" + return "\033]4;%s;%s\007" % (index, color) def set_iterm_tab_color(color): """Set iTerm2 tab/window color""" red, green, blue = util.hex_to_rgb(color) - return [ - f"\033]6;1;bg;red;brightness;{red}\a", - f"\033]6;1;bg;green;brightness;{green}\a", - f"\033]6;1;bg;blue;brightness;{blue}\a", - ] + return """ + \033]6;1;bg;red;brightness;%s\a + \033]6;1;bg;green;brightness;%s\a + \033]6;1;bg;blue;brightness;%s\a + """ % (red, green, blue) def create_sequences(colors, vte): """Create the escape sequences.""" # Colors 0-15. - sequences = [set_color(num, col) for num, col in - enumerate(colors["colors"].values())] + sequences = [set_color(index, colors["colors"]["color%s" % index]) + for index in range(16)] # Set a blank color that isn't affected by bold highlighting. # Used in wal.vim's airline theme. @@ -81,5 +82,5 @@ def send(colors, vte, cache_dir=CACHE_DIR): for term in glob.glob(tty_pattern): util.save_file(sequences, term) - util.save_file(sequences, cache_dir / "sequences") + util.save_file(sequences, os.path.join(cache_dir, "sequences")) print("colors: Set terminal colors.") diff --git a/pywal/settings.py b/pywal/settings.py index 2a06155..e200d6e 100644 --- a/pywal/settings.py +++ b/pywal/settings.py @@ -9,15 +9,15 @@ Created by Dylan Araps. """ -import pathlib +import os import platform __version__ = "0.5.13" -HOME = pathlib.Path.home() -CACHE_DIR = HOME / ".cache/wal/" -MODULE_DIR = pathlib.Path(__file__).parent +HOME = os.environ["HOME"] +CACHE_DIR = os.path.join(HOME, ".cache/wal/") +MODULE_DIR = os.path.dirname(__file__) COLOR_COUNT = 16 OS = platform.uname()[0] diff --git a/pywal/util.py b/pywal/util.py index 9931958..55be6c2 100644 --- a/pywal/util.py +++ b/pywal/util.py @@ -3,7 +3,6 @@ Misc helper functions. """ import json import os -import pathlib import subprocess @@ -21,7 +20,7 @@ class Color: def rgb(self): """Convert a hex color to rgb.""" red, green, blue = hex_to_rgb(self.hex_color) - return f"{red},{green},{blue}" + return "%s,%s,%s" % (red, green, blue) @property def xrgba(self): @@ -31,7 +30,7 @@ class Color: @property def alpha(self): """Add URxvt alpha value to color.""" - return f"[{self.alpha_num}]{self.hex_color}" + return "[%s]%s" % (self.alpha_num, self.hex_color) def read_file(input_file): @@ -65,7 +64,7 @@ def save_file(data, export_file): with open(export_file, "w") as file: file.write(data) except PermissionError: - print(f"[!] warning: Couldn't write to {export_file}.") + print("warning: Couldn't write to %s." % export_file) def save_file_json(data, export_file): @@ -78,7 +77,7 @@ def save_file_json(data, export_file): def create_dir(directory): """Alias to create the cache dir.""" - pathlib.Path(directory).mkdir(parents=True, exist_ok=True) + os.makedirs(directory, exist_ok=True) def hex_to_rgb(color): @@ -88,13 +87,13 @@ def hex_to_rgb(color): def hex_to_xrgba(color): """Convert a hex color to xrdb rgba.""" - col = color.lower() - return f"{col[1]}{col[2]}/{col[3]}{col[4]}/{col[5]}{col[6]}/ff" + col = color.lower().strip("#") + return "%s%s/%s%s/%s%s/ff" % (*col,) def rgb_to_hex(color): """Convert an rgb color to hex.""" - return f"#{color[0]:02x}{color[1]:02x}{color[2]:02x}" + return "#%02x%02x%02x" % (*color,) def darken_color(color, amount): diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py index f1ce1dd..7f09684 100644 --- a/pywal/wallpaper.py +++ b/pywal/wallpaper.py @@ -84,7 +84,7 @@ def set_desktop_wallpaper(desktop, img): def set_mac_wallpaper(img): """Set the wallpaper on macOS.""" db_file = HOME / "Library/Application Support/Dock/desktoppicture.db" - subprocess.call(["sqlite3", db_file, f"update data set value = '{img}'"]) + subprocess.call(["sqlite3", db_file, "update data set value = '%s'" % img]) # Kill the dock to fix issues with cached wallpapers. # macOS caches wallpapers and if a wallpaper is set that shares @@ -114,9 +114,9 @@ def change(img): def get(cache_dir=CACHE_DIR): """Get the current wallpaper.""" - current_wall = cache_dir / "wal" + current_wall = os.path.join(cache_dir, "wal") - if current_wall.is_file(): + if os.path.isfile(current_wall): return util.read_file(current_wall)[0] return "None" @@ -4,7 +4,7 @@ import setuptools try: import pywal except (ImportError, SyntaxError): - print("error: pywal requires Python 3.6 or greater.") + print("error: pywal requires Python 3.5 or greater.") quit(1) diff --git a/tests/test_export.py b/tests/test_export.py index 2323c69..7cb0bb4 100755 --- a/tests/test_export.py +++ b/tests/test_export.py @@ -2,7 +2,7 @@ import unittest import unittest.mock import io -import pathlib +import os from pywal import export from pywal import util @@ -11,7 +11,6 @@ from pywal import util # Import colors. COLORS = util.read_file_json("tests/test_files/test_file.json") COLORS["colors"].update(COLORS["special"]) -OUTPUT_DIR = pathlib.Path("/tmp/wal") util.create_dir("/tmp/wal") @@ -21,34 +20,36 @@ class TestExportColors(unittest.TestCase): def test_all_templates(self): """> Test substitutions in template file.""" - export.every(COLORS, OUTPUT_DIR) + export.every(COLORS, "/tmp/wal") - result = pathlib.Path("/tmp/wal/colors.sh").is_file() + result = os.path.isfile("/tmp/wal/colors.sh") self.assertTrue(result) - content = pathlib.Path("/tmp/wal/colors.sh").read_text() - content = content.split("\n")[6] - self.assertEqual(content, "foreground='#F5F1F4'") + with open("/tmp/wal/colors.sh") as file: + content = file.read().splitlines() + + self.assertEqual(content[6], "foreground='#F5F1F4'") def test_css_template(self): """> Test substitutions in template file (css).""" - export.color(COLORS, "css", OUTPUT_DIR / "test.css") + export.color(COLORS, "css", "/tmp/wal/test.css") - result = pathlib.Path("/tmp/wal/test.css").is_file() + result = os.path.isfile("/tmp/wal/test.css") self.assertTrue(result) - content = pathlib.Path("/tmp/wal/test.css").read_text() - content = content.split("\n")[6] - self.assertEqual(content, " --background: #1F211E;") + with open("/tmp/wal/test.css") as file: + content = file.read().splitlines() + + self.assertEqual(content[6], " --background: #1F211E;") def test_invalid_template(self): """> Test template validation.""" - error_msg = "[!] warning: template 'dummy' doesn't exist." + error_msg = "warning: template 'dummy' doesn't exist." # Since this function prints a message on fail we redirect # it's output so that we can read it. with unittest.mock.patch('sys.stdout', new=io.StringIO()) as fake_out: - export.color(COLORS, "dummy", OUTPUT_DIR / "test.css") + export.color(COLORS, "dummy", "/tmp/wal/test.css") self.assertEqual(fake_out.getvalue().strip(), error_msg) diff --git a/tests/test_main.py b/tests/test_main.py index 196e3cf..1cc1e57 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -2,6 +2,8 @@ import unittest import unittest.mock +import os + from pywal import __main__ from pywal import reload from pywal import wallpaper @@ -22,7 +24,8 @@ class TestMain(unittest.TestCase): """> Test arg parsing (-c).""" args = __main__.get_args(["-c"]) __main__.process_args(args) - self.assertFalse((CACHE_DIR / "schemes").is_dir()) + scheme_dir = os.path.join(CACHE_DIR, "schemes") + self.assertFalse(os.path.isdir(scheme_dir)) def test_args_e(self): """> Test arg parsing (-e).""" diff --git a/tests/test_sequences.py b/tests/test_sequences.py index 66f4084..8034da7 100755 --- a/tests/test_sequences.py +++ b/tests/test_sequences.py @@ -32,7 +32,14 @@ class Testsequences(unittest.TestCase): def test_set_iterm_tab_color(self): """> Create iterm tab color sequences""" result = sequences.set_iterm_tab_color(COLORS["special"]["background"]) - self.assertEqual(len(result), 3) + self.assertEqual(len(result), 104) + + def test_sequence_order(self): + """> Test that the sequences are in order.""" + result = sequences.create_sequences(COLORS, vte=False).split("\007") + self.assertEqual(result[2], "\x1b]4;2;#CC6A93") + self.assertEqual(result[15], "\x1b]4;15;#F5F1F4") + self.assertEqual(result[8], "\x1b]4;8;#666666") if __name__ == "__main__": diff --git a/tests/test_util.py b/tests/test_util.py index bc551ef..79b6b96 100755 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,7 +1,6 @@ """Test util functions.""" import unittest import os -import pathlib from pywal import util @@ -35,24 +34,23 @@ class TestUtil(unittest.TestCase): def test_save_file(self): """> Save colors to a file.""" - tmp_file = pathlib.Path("/tmp/test_file") + tmp_file = "/tmp/test_file" util.save_file("Hello, world", tmp_file) - result = tmp_file.is_file() + result = os.path.isfile(tmp_file) self.assertTrue(result) def test_save_file_json(self): """> Save colors to a file.""" - tmp_file = pathlib.Path("/tmp/test_file.json") + tmp_file = "/tmp/test_file.json" util.save_file_json(COLORS, tmp_file) - result = tmp_file.is_file() + result = os.path.isfile(tmp_file) self.assertTrue(result) def test_create_dir(self): """> Create a directory.""" - tmp_dir = pathlib.Path("/tmp/test_dir") + tmp_dir = "/tmp/test_dir" util.create_dir(tmp_dir) - result = tmp_dir.is_dir() - self.assertTrue(result) + self.assertTrue(os.path.isdir(tmp_dir)) os.rmdir(tmp_dir) def test_hex_to_rgb_black(self): |