diff options
| -rw-r--r-- | pywal/export.py | 12 | ||||
| -rw-r--r-- | pywal/settings.py | 1 | ||||
| -rw-r--r-- | pywal/util.py | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/pywal/export.py b/pywal/export.py index 5aaf2c6..92e64fe 100644 --- a/pywal/export.py +++ b/pywal/export.py @@ -3,7 +3,7 @@ Export colors in various formats. """ import os -from .settings import CACHE_DIR, MODULE_DIR +from .settings import CACHE_DIR, MODULE_DIR, CONF_DIR from . import util @@ -42,13 +42,19 @@ def get_export_type(export_type): def every(colors, output_dir=CACHE_DIR): """Export all template files.""" - all_colors = flatten_colors(colors) + colors = flatten_colors(colors) template_dir = os.path.join(MODULE_DIR, "templates") + template_dir_user = os.path.join(CONF_DIR, "templates") + util.create_dir(template_dir_user) for file in os.scandir(template_dir): - template(all_colors, file.path, os.path.join(output_dir, file.name)) + template(colors, file.path, os.path.join(output_dir, file.name)) + + for file in os.scandir(template_dir_user): + template(colors, file.path, os.path.join(output_dir, file.name)) print("export: Exported all files.") + print("export: Exported all user files.") def color(colors, export_type, output_file=None): diff --git a/pywal/settings.py b/pywal/settings.py index c8069b5..75c346d 100644 --- a/pywal/settings.py +++ b/pywal/settings.py @@ -19,5 +19,6 @@ __version__ = "0.7.5" HOME = os.getenv("HOME", os.getenv("USERPROFILE")) CACHE_DIR = os.path.join(HOME, ".cache", "wal") MODULE_DIR = os.path.dirname(__file__) +CONF_DIR = os.path.join(HOME, ".config", "wal") COLOR_COUNT = 16 OS = platform.uname()[0] diff --git a/pywal/util.py b/pywal/util.py index c609f71..37df3a8 100644 --- a/pywal/util.py +++ b/pywal/util.py @@ -33,6 +33,11 @@ class Color: """Add URxvt alpha value to color.""" return "[%s]%s" % (self.alpha_num, self.hex_color) + @property + def strip(self): + """Strip '#' from color.""" + return self.hex_color[1:] + def read_file(input_file): """Read data from a file and trim newlines.""" |