From e8ebff12476a8a13c77b9365502456f528a3e6a2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 1 Apr 2018 15:39:24 +1000 Subject: general: cleanup. --- pywal/__main__.py | 1 - pywal/colors.py | 18 +++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'pywal') diff --git a/pywal/__main__.py b/pywal/__main__.py index 866f6ba..0214fa7 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -157,7 +157,6 @@ def process_args(args): wallpaper.change(colors_plain["wallpaper"]) sequences.send(colors_plain, to_send=not args.s) - export.every(colors_plain) if not args.e: diff --git a/pywal/colors.py b/pywal/colors.py index c0a0f1f..280f090 100644 --- a/pywal/colors.py +++ b/pywal/colors.py @@ -82,6 +82,14 @@ def cache_fname(img, backend, light, cache_dir): return [cache_dir, "schemes", "%s_%s_%s_%s.json" % (*file_parts,)] +def get_backend(backend): + """Figure out which backend to use.""" + if backend == "random": + backends = list_backends() + random.shuffle(backends) + return backends[0] + + def get(img, light=False, backend="wal", cache_dir=CACHE_DIR): """Generate a palette.""" # home_dylan_img_jpg_backend_1.2.2.json @@ -95,21 +103,17 @@ def get(img, light=False, backend="wal", cache_dir=CACHE_DIR): else: logging.info("Generating a colorscheme...") - - if backend == "random": - backends = list_backends() - random.shuffle(backends) - backend = backends[0] - - logging.info("Using %s backend.", backend) + backend = get_backend(backend) # Dynamically import the backend we want to use. # This keeps the dependencies "optional". try: __import__("pywal.backends.%s" % backend) except ImportError: + __import__("pywal.backends.wal") backend = "wal" + logging.info("Using %s backend.", backend) backend = sys.modules["pywal.backends.%s" % backend] colors = colors_to_dict(getattr(backend, "get")(img, light), img) -- cgit v1.2.3