extern/pywal
1
0
Fork 0
mirror of https://github.com/dylanaraps/pywal.git synced 2025-06-21 10:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

colors: Simplify random img.

Browse Source
This commit is contained in:
Dylan Araps 2017-06-26 15:09:35 +10:00
parent 25870f9872
commit 67888e041b
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pywal/gen_colors.py
View File

@ -12,37 +12,31 @@ from pywal import settings as s
from pywal import util from pywal import util
def random_img(img_dir):
"""Pick a random image file from a directory."""
current_wall = pathlib.Path(s.CACHE_DIR / "wal")
if current_wall.is_file():
current_wall = util.read_file(current_wall)
current_wall = os.path.basename(current_wall[0])
# Add all images to a list excluding the current wallpaper.
file_types = (".png", ".jpg", ".jpeg", ".jpe", ".gif")
images = [img for img in os.listdir(img_dir)
if img.endswith(file_types) and img != current_wall]
return pathlib.Path(img_dir / random.choice(images))
def get_image(img): def get_image(img):
"""Validate image input.""" """Validate image input."""
# Check if the user has Imagemagick installed.
if not shutil.which("convert"):
print("error: imagemagick not found, exiting...\n"
"error: wal requires imagemagick to function.")
exit(1)
image = pathlib.Path(img) image = pathlib.Path(img)
if image.is_file(): if image.is_file():
wal_img = image wal_img = image
# Pick a random image from the directory.
elif image.is_dir(): elif image.is_dir():
file_types = (".png", ".jpg", ".jpeg", ".jpe", ".gif") wal_img = random_img(image)
# Get the filename of the current wallpaper.
current_img = pathlib.Path(s.CACHE_DIR / "wal")
if current_img.is_file():
current_img = util.read_file(current_img)
current_img = os.path.basename(current_img[0])
# Get a list of images.
images = [img for img in os.listdir(image)
if img.endswith(file_types) and
img != current_img]
wal_img = random.choice(images)
wal_img = pathlib.Path(image / wal_img)
else: else:
print("error: No valid image file found.") print("error: No valid image file found.")
@ -63,6 +57,12 @@ def imagemagick(color_count, img):
def gen_colors(img): def gen_colors(img):
"""Generate a color palette using imagemagick.""" """Generate a color palette using imagemagick."""
# Check if the user has Imagemagick installed.
if not shutil.which("convert"):
print("error: imagemagick not found, exiting...\n"
"error: wal requires imagemagick to function.")
exit(1)
# Generate initial scheme. # Generate initial scheme.
raw_colors = imagemagick(s.COLOR_COUNT, img) raw_colors = imagemagick(s.COLOR_COUNT, img)