From b79a0d65146f539e212639acb774e8a1a4adea7e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 31 Dec 2017 07:55:22 +1100 Subject: shuffle: Better error handling, don't exit if one image found. Closes #149 --- pywal/image.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pywal/image.py b/pywal/image.py index e4bccfa..5e9413d 100644 --- a/pywal/image.py +++ b/pywal/image.py @@ -19,10 +19,13 @@ def get_random_image(img_dir): ".PNG", ".JPG", ".JPEG", ".JPE", ".GIF") images = [img for img in os.scandir(img_dir) - if img.name.endswith(file_types) and img.name != current_wall] + if img.name.endswith(file_types)] - if not images: - print("image: No new images found (nothing to do), exiting...") + if len(images) > 2 and current_wall in images: + images.remove(current_wall) + + elif not images: + print("error: No images found in directory.") sys.exit(1) random.shuffle(images) -- cgit v1.2.3