make contrast actually do something

eylles · Aug 24, 2024 · 4b816cc · 4b816cc
1 parent 42b7ada
commit 4b816cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/pywal/__main__.py b/pywal/__main__.py
@@ -122,6 +122,7 @@ def get_args():
                      help="Skip reloading gtk/xrdb/i3/sway/polybar")
 
     arg.add_argument("--contrast", metavar="1.0-21.0",
+                     required = False, type=float, nargs='?',
                      help="Specify a minimum contrast ratio between palette "
                           "colors and the source image according to W3 "
                           "contrast specifications. Values between 1.5-4.5 "
@@ -201,7 +202,7 @@ def parse_args(parser):
     if args.w:
         cached_wallpaper = util.read_file(os.path.join(CACHE_DIR, "wal"))
         colors_plain = colors.get(cached_wallpaper[0], args.l, args.cols16, args.backend,
-                                  sat=args.saturate)
+                                  sat=args.saturate,contrast=args.contrast)
 
     if args.b:
         args.b = "#%s" % (args.b.strip("#"))

diff --git a/pywal/colors.py b/pywal/colors.py
@@ -197,9 +197,9 @@ def ensure_contrast(colors, contrast, light, image):
         #  produce the desired luminance, additionally decrease saturation
         elif not light:
             colors[index] = binary_luminance_adjust(luminance_desired, h, 0, s, 1, 1)
-        # If the color is to be darker than background, produce desired luminance by decreasing value
+        # If the color is to be darker than background, produce desired luminance by decreasing value, and raising saturation
         else:
-            colors[index] = binary_luminance_adjust(luminance_desired, h, s, s, 0, v)
+            colors[index] = binary_luminance_adjust(luminance_desired, h, s, 1, 0, v)
 
     return colors
 
@@ -283,7 +283,11 @@ def palette():
 def get(img, light=False, cols16=False, backend="wal", cache_dir=CACHE_DIR, sat="", contrast=""):
     """Generate a palette."""
     # home_dylan_img_jpg_backend_1.2.2.json
-    cache_name = cache_fname(img, backend, cols16, light, cache_dir, sat, float(contrast))
+    if not contrast or contrast == "":
+        cache_name = cache_fname(img, backend, cols16, light, cache_dir, sat, "None")
+    else:
+        cache_name = cache_fname(img, backend, cols16, light, cache_dir, sat, float(contrast))
+
     cache_file = os.path.join(*cache_name)
 
     # Check the wallpaper's checksum against the cache'

diff --git a/pywal/settings.py b/pywal/settings.py
@@ -13,8 +13,8 @@
 import platform
 
 
-__version__ = "3.6.0"
-__cache_version__ = "1.1.0"
+__version__ = "3.6.1"
+__cache_version__ = "2.0.0"
 
 
 HOME = os.getenv("HOME", os.getenv("USERPROFILE"))