general: cleanup.

This commit is contained in:
Dylan Araps 2018-04-01 15:39:24 +10:00
parent 50de3cf270
commit e8ebff1247
2 changed files with 11 additions and 8 deletions

View File

@ -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:

View File

@ -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)