Skip to content

fix(wallpaper): support matugen 4.x and TTY-less invocation #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wendeus0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(wallpaper): support matugen 4.x and TTY-less invocation #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions ignis/scripts/wallpaper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ def setWall(path):
if colorScheme in schemes:
asyncio.create_task(
utils.exec_sh_async(
f"matugen image -t scheme-{colorScheme} '{path}' -m '{mode}'"
f"matugen image -t scheme-{colorScheme} '{path}' -m '{mode}' --prefer saturation"
)
)
else:
asyncio.create_task(
utils.exec_sh_async(
f"matugen image -t scheme-tonal-spot '{path}' -m '{mode}'"
f"matugen image -t scheme-tonal-spot '{path}' -m '{mode}' --prefer saturation"
)
)

Expand Down Expand Up @@ -68,13 +68,13 @@ def setColors(colorScheme):
if colorScheme in schemes:
asyncio.create_task(
utils.exec_sh_async(
f"matugen image -t scheme-{colorScheme} '{path}' -m '{mode}'"
f"matugen image -t scheme-{colorScheme} '{path}' -m '{mode}' --prefer saturation"
)
)
else:
asyncio.create_task(
utils.exec_sh_async(
f"matugen image -t scheme-tonal-spot '{path}' -m '{mode}'"
f"matugen image -t scheme-tonal-spot '{path}' -m '{mode}' --prefer saturation"
)
)

Expand Down Expand Up @@ -116,7 +116,7 @@ def setDarkMode(active):
if colorScheme in schemes:
asyncio.create_task(
utils.exec_sh_async(
f"matugen image -t scheme-{colorScheme} '{path}' -m '{mode}'"
f"matugen image -t scheme-{colorScheme} '{path}' -m '{mode}' --prefer saturation"
)
)
asyncio.create_task(
Expand All @@ -127,7 +127,7 @@ def setDarkMode(active):
else:
asyncio.create_task(
utils.exec_sh_async(
f"matugen image -t scheme-tonal-spot '{path}' -m '{mode}'"
f"matugen image -t scheme-tonal-spot '{path}' -m '{mode}' --prefer saturation"
)
)
asyncio.create_task(
Expand Down Expand Up @@ -168,12 +168,12 @@ async def do_generate():

tasks_palette = []
for scheme in schemes:
command = f"matugen image -t scheme-{scheme} '{path}' -m {current_mode} --json hex --dry-run"
command = f"matugen image -t scheme-{scheme} '{path}' -m {current_mode} --prefer saturation --json hex --dry-run"
tasks_palette.append(utils.exec_sh_async(command))

tasks_theme = []
for mode in ["light", "dark"]:
command = f"matugen image -t scheme-{current_scheme} '{path}' -m {mode} --json hex --dry-run"
command = f"matugen image -t scheme-{current_scheme} '{path}' -m {mode} --prefer saturation --json hex --dry-run"
tasks_theme.append(utils.exec_sh_async(command))

all_results = await asyncio.gather(*(tasks_palette + tasks_theme))
Expand All @@ -200,6 +200,8 @@ async def do_generate():
for color_name, values in data["colors"].items():
if current_mode in values:
color_value = values[current_mode]
if isinstance(color_value, dict):
color_value = color_value.get("color") or color_value.get("hex") or next(iter(color_value.values()))
variable_name = f"palette-{scheme}-{color_name.replace('_', '-')}"
scss_content += (
f"${variable_name}: {color_value};\n"
Expand Down Expand Up @@ -228,6 +230,8 @@ async def do_generate():
for color_name, values in data["colors"].items():
if mode in values:
color_value = values[mode]
if isinstance(color_value, dict):
color_value = color_value.get("color") or color_value.get("hex") or next(iter(color_value.values()))
variable_name = (
f"theme-{mode}-{color_name.replace('_', '-')}"
)
Expand Down