diff options
| author | Dylan Araps <dylan.araps@gmail.com> | 2018-04-01 15:39:24 +1000 |
|---|---|---|
| committer | Dylan Araps <dylan.araps@gmail.com> | 2018-04-01 15:39:24 +1000 |
| commit | e8ebff12476a8a13c77b9365502456f528a3e6a2 (patch) | |
| tree | fe5c868a9dd2bfa7c2d842cc66321dab99d1bda7 | |
| parent | 50de3cf270592d5f047b1550b0bbf35d709d96a8 (diff) | |
general: cleanup.
| -rw-r--r-- | pywal/__main__.py | 1 | ||||
| -rw-r--r-- | pywal/colors.py | 18 |
2 files changed, 11 insertions, 8 deletions
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) |
