From 6430724400e698c6971bf605216cbf4a4d203a12 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Mar 2018 09:42:32 +1100 Subject: [PATCH] backend: Add colorthief.py --- pywal/backends/colorthief.py | 4 ++-- pywal/backends/wal.py | 4 ++-- pywal/colors.py | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pywal/backends/colorthief.py b/pywal/backends/colorthief.py index 349822c..71877aa 100644 --- a/pywal/backends/colorthief.py +++ b/pywal/backends/colorthief.py @@ -9,7 +9,7 @@ from .. import util from ..settings import COLOR_COUNT -def create_palette(img, colors): +def adjust(img, colors): """Create palette.""" raw_colors = colors[:1] + colors[8:16] + colors[8:-1] @@ -61,4 +61,4 @@ def gen_colors(img, color_count): def get(img, color_count=COLOR_COUNT, light=False): """Get colorscheme.""" colors = gen_colors(img, color_count) - return create_palette(img, colors) + return adjust(img, colors) diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py index 14c4bff..814ef20 100644 --- a/pywal/backends/wal.py +++ b/pywal/backends/wal.py @@ -56,7 +56,7 @@ def gen_colors(img, color_count): return [re.search("#.{6}", str(col)).group(0) for col in raw_colors[1:]] -def create_palette(img, colors, light): +def adjust(img, colors, light): """Sort the generated colors and store them in a dict that we will later save in json format.""" raw_colors = colors[:1] + colors[8:16] + colors[8:-1] @@ -103,4 +103,4 @@ def create_palette(img, colors, light): def get(img, color_count=COLOR_COUNT, light=False): """Get colorscheme.""" colors = gen_colors(img, color_count) - return create_palette(img, colors, light) + return adjust(img, colors, light) diff --git a/pywal/colors.py b/pywal/colors.py index 6123690..8e75a6d 100644 --- a/pywal/colors.py +++ b/pywal/colors.py @@ -24,8 +24,9 @@ def generate(img, cache_dir=CACHE_DIR, # home_dylan_img_jpg_1.2.2.json color_type = "light" if light else "dark" cache_file = re.sub("[/|\\|.]", "_", img) - cache_file = os.path.join(cache_dir, "schemes", "%s_%s_%s.json" - % (cache_file, color_type, __cache_version__)) + cache_file = os.path.join(cache_dir, "schemes", "%s_%s_%s_%s.json" + % (cache_file, color_type, + backend, __cache_version__)) if os.path.isfile(cache_file): colors = file(cache_file)