replaced click
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 25s
Python / lint-format (pull_request) Successful in 33s
Python / test (pull_request) Successful in 48s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m49s

This commit is contained in:
2026-05-26 18:47:56 +02:00
parent 439aa9ed1e
commit 7d4f563b43
4 changed files with 19 additions and 16 deletions
-1
View File
@@ -52,7 +52,6 @@ jobs:
python3 -m venv .venv
. .venv/bin/activate
pip install --no-cache-dir \
click \
typer \
pillow \
materialyoucolor \
-1
View File
@@ -7,7 +7,6 @@ name = "zshell"
requires-python = ">=3.13"
version = "0.1.0"
dependencies = [
"click",
"typer",
"pillow",
"jinja2",
+5 -6
View File
@@ -2,7 +2,6 @@ from __future__ import annotations
import sys
from pathlib import Path
import click
import typer
from typer._completion_shared import install, _get_shell_name
from zshell.subcommands import shell, scheme, screenshot, wallpaper, record
@@ -30,16 +29,16 @@ def _completion_installed() -> bool:
def _install_completion() -> None:
if _completion_installed():
click.echo("zshell-cli: Shell completion already installed.")
print("zshell-cli: Shell completion already installed.")
raise typer.Exit()
shell = _get_shell_name()
if shell is None:
click.echo("zshell-cli: Unable to detect shell type.", err=True)
print("zshell-cli: Unable to detect shell type.", file=sys.stderr)
raise typer.Exit(code=1)
try:
_, path = install(prog_name="zshell-cli")
click.secho(f"zshell-cli: Shell completion installed ({shell}: {path})", fg="green")
click.echo("zshell-cli: Restart your shell or source the file to enable tab-completion.")
print(f"zshell-cli: Shell completion installed ({shell}: {path})")
print("zshell-cli: Restart your shell or source the file to enable tab-completion.")
except Exception:
pass
@@ -49,5 +48,5 @@ def main() -> None:
_install_completion()
return
if sys.stdout.isatty() and not _completion_installed():
click.echo("zshell-cli: Tip: run with --install-autocomplete for tab completion.", err=True)
print("zshell-cli: Tip: run with --install-autocomplete for tab completion.", file=sys.stderr)
app()
+14 -8
View File
@@ -2,7 +2,6 @@ import subprocess
import sys
import time
import click
import typer
args = ["qs", "-c", "zshell"]
@@ -14,7 +13,8 @@ app = typer.Typer()
def kill():
result = subprocess.run(args + ["kill"], capture_output=True)
if result.returncode != 0:
raise click.ClickException("No running instance to kill.")
sys.stderr.write("No running instance to kill.\n")
sys.exit(1)
sys.stderr.write(result.stderr.decode())
@@ -23,10 +23,12 @@ def start_instance(no_daemon: bool = False) -> None:
stdout = result.stdout.decode().strip()
if stdout:
if "already running" in stdout.lower():
raise click.ClickException(stdout)
sys.stderr.write(stdout + "\n")
sys.exit(1)
if result.returncode != 0:
stderr = result.stderr.decode().strip()
raise click.ClickException(stderr)
sys.stderr.write(stderr + "\n")
sys.exit(1)
@app.command()
@@ -50,7 +52,8 @@ def restart(no_daemon: bool = False):
def show():
result = subprocess.run(args + ["ipc"] + ["show"], capture_output=True)
if result.returncode != 0:
raise click.ClickException(result.stderr.decode().strip())
sys.stderr.write(result.stderr.decode())
sys.exit(1)
sys.stdout.write(result.stdout.decode())
sys.stderr.write(result.stderr.decode())
@@ -59,7 +62,8 @@ def show():
def log():
result = subprocess.run(args + ["log"], capture_output=True)
if result.returncode != 0:
raise click.ClickException(result.stderr.decode().strip())
sys.stderr.write(result.stderr.decode())
sys.exit(1)
sys.stdout.write(result.stdout.decode())
sys.stderr.write(result.stderr.decode())
@@ -68,7 +72,8 @@ def log():
def lock():
result = subprocess.run(args + ["ipc"] + ["call"] + ["lock"] + ["lock"], capture_output=True)
if result.returncode != 0:
raise click.ClickException(result.stderr.decode().strip())
sys.stderr.write(result.stderr.decode())
sys.exit(1)
sys.stderr.write(result.stderr.decode())
@@ -76,5 +81,6 @@ def lock():
def call(target: str, method: str, method_args: list[str] = typer.Argument(None)):
result = subprocess.run(args + ["ipc"] + ["call"] + [target] + [method] + (method_args or []), capture_output=True)
if result.returncode != 0:
raise click.ClickException(result.stderr.decode().strip())
sys.stderr.write(result.stderr.decode())
sys.exit(1)
sys.stderr.write(result.stderr.decode())