chore: python code formatted with ruff, ruff formatter + linter, pyproject.toml now in root
C++ / fmt (pull_request) Successful in 4s
JS/TS / fmt (pull_request) Successful in 15s
JS/TS / lint (pull_request) Successful in 18s
Python / lint (pull_request) Failing after 32s
Python / fmt (pull_request) Failing after 37s
Python / test (pull_request) Successful in 52s
C++ / build (pull_request) Successful in 1m56s
Rust / fmt (pull_request) Successful in 1m22s
Rust / build (pull_request) Successful in 2m5s
Python / buildcheck (pull_request) Successful in 2m39s
Rust / clippy (pull_request) Successful in 2m1s
C++ / clang-tidy (pull_request) Successful in 3m46s
C++ / fmt (pull_request) Successful in 4s
JS/TS / fmt (pull_request) Successful in 15s
JS/TS / lint (pull_request) Successful in 18s
Python / lint (pull_request) Failing after 32s
Python / fmt (pull_request) Failing after 37s
Python / test (pull_request) Successful in 52s
C++ / build (pull_request) Successful in 1m56s
Rust / fmt (pull_request) Successful in 1m22s
Rust / build (pull_request) Successful in 2m5s
Python / buildcheck (pull_request) Successful in 2m39s
Rust / clippy (pull_request) Successful in 2m1s
C++ / clang-tidy (pull_request) Successful in 3m46s
This commit is contained in:
+51
-33
@@ -1,12 +1,14 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import typer
|
||||
from typer._completion_shared import install, _get_shell_name
|
||||
from typer._completion_classes import completion_init
|
||||
from zshell.subcommands import shell, scheme, screenshot, wallpaper, record
|
||||
from typer._completion_shared import _get_shell_name, install
|
||||
|
||||
from zshell.subcommands import record, scheme, screenshot, shell, wallpaper
|
||||
|
||||
app = typer.Typer(name="zshell-cli", add_completion=False)
|
||||
|
||||
@@ -18,40 +20,56 @@ app.add_typer(record.app, name="record")
|
||||
|
||||
|
||||
def _completion_installed() -> bool:
|
||||
shell = _get_shell_name()
|
||||
match shell:
|
||||
case "zsh":
|
||||
return (Path.home() / ".zfunc" / "_zshell-cli").exists()
|
||||
case "bash":
|
||||
return (Path.home() / ".bash_completions" / "zshell-cli.sh").exists()
|
||||
case "fish":
|
||||
return (Path.home() / ".config" / "fish" / "completions" / "zshell-cli.fish").exists()
|
||||
return False
|
||||
shell = _get_shell_name()
|
||||
match shell:
|
||||
case "zsh":
|
||||
return (Path.home() / ".zfunc" / "_zshell-cli").exists()
|
||||
case "bash":
|
||||
return (
|
||||
Path.home() / ".bash_completions" / "zshell-cli.sh"
|
||||
).exists()
|
||||
case "fish":
|
||||
return (
|
||||
Path.home()
|
||||
/ ".config"
|
||||
/ "fish"
|
||||
/ "completions"
|
||||
/ "zshell-cli.fish"
|
||||
).exists()
|
||||
return False
|
||||
|
||||
|
||||
def _install_completion() -> None:
|
||||
if _completion_installed():
|
||||
print("zshell-cli: Shell completion already installed.")
|
||||
sys.exit(0)
|
||||
shell = _get_shell_name()
|
||||
if shell is None:
|
||||
print("zshell-cli: Unable to detect shell type.", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
try:
|
||||
_, path = install(prog_name="zshell-cli")
|
||||
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 as e:
|
||||
print(f"zshell-cli: Failed to install shell completion: {e}", file=sys.stderr)
|
||||
raise typer.Exit(code=1)
|
||||
if _completion_installed():
|
||||
print("zshell-cli: Shell completion already installed.")
|
||||
sys.exit(0)
|
||||
shell = _get_shell_name()
|
||||
if shell is None:
|
||||
print("zshell-cli: Unable to detect shell type.", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
try:
|
||||
_, path = install(prog_name="zshell-cli")
|
||||
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 as e:
|
||||
print(
|
||||
f"zshell-cli: Failed to install shell completion: {e}",
|
||||
file=sys.stderr,
|
||||
)
|
||||
raise typer.Exit(code=1) from None
|
||||
|
||||
|
||||
def main() -> None:
|
||||
if "--install-autocomplete" in sys.argv:
|
||||
_install_completion()
|
||||
return
|
||||
if "_ZSHELL_CLI_COMPLETE" in os.environ:
|
||||
completion_init()
|
||||
if sys.stdout.isatty() and not _completion_installed():
|
||||
print("zshell-cli: Tip: run with --install-autocomplete for tab completion.", file=sys.stderr)
|
||||
app()
|
||||
if "--install-autocomplete" in sys.argv:
|
||||
_install_completion()
|
||||
return
|
||||
if "_ZSHELL_CLI_COMPLETE" in os.environ:
|
||||
completion_init()
|
||||
if sys.stdout.isatty() and not _completion_installed():
|
||||
print(
|
||||
"zshell-cli: Tip: run with --install-autocomplete for tab completion.",
|
||||
file=sys.stderr,
|
||||
)
|
||||
app()
|
||||
|
||||
Reference in New Issue
Block a user