wallpaper: fix print command

This commit is contained in:
2 * r + 2 * t
2025-06-17 13:29:25 +10:00
parent 8b6ed5e403
commit 3416178ad4
2 changed files with 12 additions and 7 deletions
+4 -2
View File
@@ -32,8 +32,10 @@ def get_colours_for_image(image: Path | str = wallpaper_thumbnail_path, scheme=N
scheme = get_scheme()
flavour = scheme.flavour if scheme.flavour in ("default", "alt1", "alt2") else "default"
cache_base = scheme_cache_dir / compute_hash(image)
cache = (cache_base / scheme.variant / scheme.flavour / scheme.mode).with_suffix(".json")
cache = (cache_base / scheme.variant / flavour / scheme.mode).with_suffix(".json")
try:
with cache.open("r") as f:
@@ -42,7 +44,7 @@ def get_colours_for_image(image: Path | str = wallpaper_thumbnail_path, scheme=N
pass
primaries, colours = get_score_for_image(image, cache_base)
i = ["default", "alt1", "alt2"].index(scheme.flavour)
i = ["default", "alt1", "alt2"].index(flavour)
scheme = gen_scheme(scheme, primaries[i], colours)
cache.parent.mkdir(parents=True, exist_ok=True)
+8 -5
View File
@@ -91,11 +91,14 @@ def get_colours_for_wall(wall: Path | str, no_smart: bool) -> None:
scheme = get_scheme()
cache = wallpapers_cache_dir / compute_hash(wall)
if scheme.name == "dynamic" and not no_smart:
name = "dynamic"
flavour = scheme.flavour if scheme.flavour in ("default", "alt1", "alt2") else "default"
if not no_smart:
scheme = Scheme(
{
"name": scheme.name,
"flavour": scheme.flavour,
"name": name,
"flavour": flavour,
"mode": get_smart_mode(wall, cache),
"variant": scheme.variant,
"colours": scheme.colours,
@@ -103,8 +106,8 @@ def get_colours_for_wall(wall: Path | str, no_smart: bool) -> None:
)
return {
"name": scheme.name,
"flavour": scheme.flavour,
"name": name,
"flavour": flavour,
"mode": scheme.mode,
"variant": scheme.variant,
"colours": get_colours_for_image(get_thumb(wall, cache), scheme),