From 88bdd9ab013bad324e1f3f4ad8516fd6d55ca312 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Thu, 20 Jul 2017 13:40:31 +1000 Subject: api: Use wal file in __main__.py --- pywal/sequences.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pywal/sequences.py') diff --git a/pywal/sequences.py b/pywal/sequences.py index 858c381..2e51bc3 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -53,9 +53,9 @@ def send_sequences(colors, vte): print("colors: Set terminal colors") -def reload_colors(vte): +def reload_colors(vte, sequence_file=None): """Reload the current scheme.""" - sequence_file = CACHE_DIR / "sequences" + sequence_file = sequence_file or CACHE_DIR / "sequences" if sequence_file.is_file(): sequences = "".join(util.read_file(sequence_file)) -- cgit v1.2.3 From 52cd5e5f1a7c972a593fe55a853afd43111531e9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 20 Jul 2017 23:19:13 +1000 Subject: General: Unhardcode all CACHE_DIR and COLOR_COUNT usage. --- pywal/sequences.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pywal/sequences.py') diff --git a/pywal/sequences.py b/pywal/sequences.py index 2e51bc3..9a90e3e 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -4,7 +4,7 @@ Send sequences to all open terminals. import os import re -from pywal.settings import CACHE_DIR +# from pywal.settings import CACHE_DIR from pywal import util @@ -18,7 +18,7 @@ def set_color(index, color): return f"\033]4;{index};{color}\007" -def send_sequences(colors, vte): +def send_sequences(colors, vte, cache_dir): """Send colors to all open terminals.""" # Colors 0-15. sequences = [set_color(num, color) @@ -44,7 +44,7 @@ def send_sequences(colors, vte): # Get the list of terminals. terminals = [f"/dev/pts/{term}" for term in os.listdir("/dev/pts/") if len(term) < 4] - terminals.append(CACHE_DIR / "sequences") + terminals.append(cache_dir / "sequences") # Send the sequences to all open terminals. # pylint: disable=W0106 @@ -53,9 +53,9 @@ def send_sequences(colors, vte): print("colors: Set terminal colors") -def reload_colors(vte, sequence_file=None): +def reload_colors(vte, cache_dir): """Reload the current scheme.""" - sequence_file = sequence_file or CACHE_DIR / "sequences" + sequence_file = cache_dir / "sequences" if sequence_file.is_file(): sequences = "".join(util.read_file(sequence_file)) -- cgit v1.2.3 From 950b7e892a98675616653bcabe405d9203691c6e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 20 Jul 2017 23:42:03 +1000 Subject: general: Remove unused module. --- pywal/sequences.py | 1 - 1 file changed, 1 deletion(-) (limited to 'pywal/sequences.py') diff --git a/pywal/sequences.py b/pywal/sequences.py index 9a90e3e..7533f19 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -4,7 +4,6 @@ Send sequences to all open terminals. import os import re -# from pywal.settings import CACHE_DIR from pywal import util -- cgit v1.2.3 From 12f9211cd4a255226d151545e0532c8507af7361 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 22 Jul 2017 09:46:45 +1000 Subject: general: Remove comments that just repeat what the code does. --- pywal/sequences.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'pywal/sequences.py') diff --git a/pywal/sequences.py b/pywal/sequences.py index 7533f19..d7f1fa9 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -40,7 +40,6 @@ def send_sequences(colors, vte, cache_dir): if not vte: sequences.append(set_special(708, colors["special"]["background"])) - # Get the list of terminals. terminals = [f"/dev/pts/{term}" for term in os.listdir("/dev/pts/") if len(term) < 4] terminals.append(cache_dir / "sequences") @@ -48,7 +47,6 @@ def send_sequences(colors, vte, cache_dir): # Send the sequences to all open terminals. # pylint: disable=W0106 [util.save_file("".join(sequences), term) for term in terminals] - print("colors: Set terminal colors") -- cgit v1.2.3 From 016e97d6e640ec8f35965f9852f46104c83e982b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 22 Jul 2017 19:11:14 +1000 Subject: lint: Remove all lint comments. --- pywal/sequences.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pywal/sequences.py') diff --git a/pywal/sequences.py b/pywal/sequences.py index d7f1fa9..c1a7bdd 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -44,9 +44,10 @@ def send_sequences(colors, vte, cache_dir): if len(term) < 4] terminals.append(cache_dir / "sequences") - # Send the sequences to all open terminals. - # pylint: disable=W0106 - [util.save_file("".join(sequences), term) for term in terminals] + # Writing to "/dev/pts/[0-9] lets you send data to open terminals. + for term in terminals: + util.save_file("".join(sequences), term) + print("colors: Set terminal colors") -- cgit v1.2.3 From de47c1beaaa77ee6f50235daba735ccc98ad608c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 22 Jul 2017 22:26:49 +1000 Subject: api: Remove wal.py --- pywal/sequences.py | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'pywal/sequences.py') diff --git a/pywal/sequences.py b/pywal/sequences.py index c1a7bdd..77eace3 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -2,9 +2,9 @@ Send sequences to all open terminals. """ import os -import re -from pywal import util +from .settings import __cache_dir__ +from . import util def set_special(index, color): @@ -17,14 +17,14 @@ def set_color(index, color): return f"\033]4;{index};{color}\007" -def send_sequences(colors, vte, cache_dir): +def send(colors, vte, cache_dir=__cache_dir__): """Send colors to all open terminals.""" # Colors 0-15. sequences = [set_color(num, color) for num, color in enumerate(colors["colors"].values())] # Special colors. - # http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.7.pod#XTerm_Operating_System_Commands + # Source: https://goo.gl/KcoQgP # 10 = foreground, 11 = background, 12 = cursor foregound # 13 = mouse foreground sequences.append(set_special(10, colors["special"]["foreground"])) @@ -32,7 +32,7 @@ def send_sequences(colors, vte, cache_dir): sequences.append(set_special(12, colors["special"]["cursor"])) sequences.append(set_special(13, colors["special"]["cursor"])) - # Set a blank color that isn"t affected by bold highlighting. + # Set a blank color that isn't affected by bold highlighting. # Used in wal.vim's airline theme. sequences.append(set_color(66, colors["special"]["background"])) @@ -49,19 +49,3 @@ def send_sequences(colors, vte, cache_dir): util.save_file("".join(sequences), term) print("colors: Set terminal colors") - - -def reload_colors(vte, cache_dir): - """Reload the current scheme.""" - sequence_file = cache_dir / "sequences" - - if sequence_file.is_file(): - sequences = "".join(util.read_file(sequence_file)) - - # If vte mode was used, remove the unsupported sequence. - if vte: - sequences = re.sub(r"\]708;\#.{6}", "", sequences) - - print(sequences, end="") - - exit(0) -- cgit v1.2.3