Improve Linux terminal input and interactive path prompts
This commit is contained in:
1 parent
eb5937a629
commit
ad2b15994f
5 files changed
+190
-22
No files matched your search
+63
-7
@@ -3,12 +3,14 @@ from __future__ import annotations
|
||||
import os
|
||||
import select
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import textwrap
|
||||
import time
|
||||
from collections import deque
|
||||
from contextlib import contextmanager
|
||||
from math import floor, log10
|
||||
from pathlib import Path
|
||||
from threading import Lock
|
||||
|
||||
|
||||
@@ -44,6 +46,26 @@ def pause_if_interactive() -> None:
|
||||
pass
|
||||
|
||||
|
||||
def launch_terminal_if_needed(argv: list[str]) -> bool:
|
||||
"""Relaunch an interactive script when a desktop starts it without a terminal."""
|
||||
if os.name == "nt" or (stream_is_interactive(sys.stdin) and stream_is_interactive(sys.stdout)):
|
||||
return False
|
||||
if not (os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")):
|
||||
return False
|
||||
|
||||
terminals = (("konsole", "-e"), ("gnome-terminal", "--"), ("x-terminal-emulator", "-e"))
|
||||
for name, separator in terminals:
|
||||
executable = shutil.which(name)
|
||||
if executable:
|
||||
script = Path(argv[0]).resolve()
|
||||
subprocess.Popen(
|
||||
[executable, separator, sys.executable, str(script), *argv[1:]],
|
||||
cwd=script.parent,
|
||||
)
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def supports_color() -> bool:
|
||||
return not os.environ.get("NO_COLOR") and supports_ansi()
|
||||
|
||||
@@ -117,7 +139,7 @@ def raw_key_input():
|
||||
fd = sys.stdin.fileno()
|
||||
settings = termios.tcgetattr(fd)
|
||||
try:
|
||||
tty.setraw(fd)
|
||||
tty.setcbreak(fd)
|
||||
yield read_key
|
||||
finally:
|
||||
termios.tcsetattr(fd, termios.TCSADRAIN, settings)
|
||||
@@ -129,13 +151,47 @@ def read_key() -> str:
|
||||
|
||||
key = msvcrt.getwch()
|
||||
if key in {"\x00", "\xe0"}:
|
||||
return {"H": "up", "P": "down", "K": "left", "M": "right"}.get(msvcrt.getwch(), "")
|
||||
return {"H": "up", "P": "down", "K": "left", "M": "right", "S": "delete"}.get(msvcrt.getwch(), "")
|
||||
else:
|
||||
key = sys.stdin.read(1)
|
||||
if key == "\x1b" and select.select([sys.stdin], [], [], 0.03)[0]:
|
||||
key += sys.stdin.read(2)
|
||||
return {"\x1b[A": "up", "\x1b[B": "down", "\x1b[D": "left", "\x1b[C": "right"}.get(key, "esc")
|
||||
return {"\r": "enter", "\n": "enter", "\x1b": "esc", "\x08": "backspace", "\x7f": "backspace", " ": "space"}.get(key, key)
|
||||
fd = sys.stdin.fileno()
|
||||
key = _read_unix_character(fd)
|
||||
if key == "\x1b":
|
||||
return _read_escape_sequence(fd)
|
||||
return {"\r": "enter", "\n": "enter", "\t": "tab", "\x1b": "esc", "\x08": "backspace", "\x7f": "backspace", " ": "space"}.get(key, key)
|
||||
|
||||
|
||||
def _read_unix_character(fd: int) -> str:
|
||||
data = os.read(fd, 1)
|
||||
first = data[0]
|
||||
length = 1 if first < 0x80 else 2 if first < 0xE0 else 3 if first < 0xF0 else 4
|
||||
while len(data) < length:
|
||||
data += os.read(fd, length - len(data))
|
||||
return data.decode("utf-8")
|
||||
|
||||
|
||||
def _read_escape_sequence(fd: int) -> str:
|
||||
if not select.select([fd], [], [], 0.1)[0]:
|
||||
return "esc"
|
||||
sequence = "\x1b" + _read_unix_character(fd)
|
||||
if sequence[1:] in {"[", "O"}:
|
||||
for _ in range(6):
|
||||
if not select.select([fd], [], [], 0.1)[0]:
|
||||
break
|
||||
character = _read_unix_character(fd)
|
||||
sequence += character
|
||||
if character.isalpha() or character == "~":
|
||||
break
|
||||
return {
|
||||
"\x1b[A": "up",
|
||||
"\x1b[B": "down",
|
||||
"\x1b[D": "left",
|
||||
"\x1b[C": "right",
|
||||
"\x1bOA": "up",
|
||||
"\x1bOB": "down",
|
||||
"\x1bOD": "left",
|
||||
"\x1bOC": "right",
|
||||
"\x1b[3~": "delete",
|
||||
}.get(sequence, "")
|
||||
|
||||
|
||||
def draw_screen(lines: list[str]) -> None:
|
||||
|
||||
@@ -1,7 +1,102 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import glob
|
||||
import os
|
||||
from contextlib import contextmanager
|
||||
from pathlib import Path
|
||||
from urllib.parse import unquote, urlparse
|
||||
|
||||
from tools.console import prompt_input
|
||||
|
||||
|
||||
def entered_path(value: str) -> Path:
|
||||
text = value.strip()
|
||||
if len(text) > 1 and text[0] == text[-1] and text[0] in "\"'":
|
||||
text = text[1:-1]
|
||||
if text.startswith("file://"):
|
||||
text = unquote(urlparse(text).path)
|
||||
return Path(text).expanduser()
|
||||
|
||||
|
||||
def path_completions(text: str, base: Path | None = None) -> list[str]:
|
||||
quote = text[0] if text[:1] in {"\"", "'"} else ""
|
||||
value = text[1:] if quote else text
|
||||
if quote and value.endswith(quote):
|
||||
value = value[:-1]
|
||||
expanded = os.path.expanduser(value)
|
||||
relative = base is not None and not Path(expanded).is_absolute()
|
||||
search = os.path.join(str(base), expanded) if relative else expanded
|
||||
found = sorted(glob.glob(glob.escape(search) + "*"), key=str.casefold)
|
||||
matches = [os.path.relpath(match, base) for match in found] if relative else found.copy()
|
||||
if value.startswith("~"):
|
||||
home = str(Path.home())
|
||||
matches = ["~" + match[len(home):] if match.startswith(home) else match for match in matches]
|
||||
return [
|
||||
quote + match + (os.sep if Path(found[index]).is_dir() else "")
|
||||
for index, match in enumerate(matches)
|
||||
]
|
||||
|
||||
|
||||
def complete_path(text: str, base: Path | None = None) -> str:
|
||||
matches = path_completions(text, base)
|
||||
return os.path.commonprefix(matches) if matches else text
|
||||
|
||||
|
||||
@contextmanager
|
||||
def path_completion(candidates=path_completions):
|
||||
try:
|
||||
import readline
|
||||
except ImportError:
|
||||
yield
|
||||
return
|
||||
|
||||
previous = readline.get_completer(), readline.get_completer_delims()
|
||||
matches: list[str] = []
|
||||
|
||||
def complete(text: str, state: int) -> str | None:
|
||||
nonlocal matches
|
||||
if state == 0:
|
||||
matches = candidates(text)
|
||||
return matches[state] if state < len(matches) else None
|
||||
|
||||
readline.set_completer(complete)
|
||||
readline.set_completer_delims("\n")
|
||||
readline.parse_and_bind("tab: complete")
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
readline.set_completer(previous[0])
|
||||
readline.set_completer_delims(previous[1])
|
||||
|
||||
|
||||
def prompt_existing_paths() -> list[str]:
|
||||
print("Enter one file or directory per line. Leave the path empty when finished.")
|
||||
paths: list[str] = []
|
||||
with path_completion():
|
||||
while True:
|
||||
value = prompt_input("Path: ").strip()
|
||||
if not value:
|
||||
return paths
|
||||
path = entered_path(value)
|
||||
if not path.exists():
|
||||
print("Path not found. Try again.")
|
||||
continue
|
||||
paths.append(str(path.resolve()))
|
||||
|
||||
|
||||
def input_paths(argv: list[str]) -> list[str]:
|
||||
return argv[1:] or prompt_existing_paths()
|
||||
|
||||
|
||||
def resolve_output_directory(value: str, default: Path) -> Path:
|
||||
if not value.strip():
|
||||
return default
|
||||
path = entered_path(value)
|
||||
path = path if path.is_absolute() else default / path
|
||||
path = path.resolve()
|
||||
if path.exists() and not path.is_dir():
|
||||
raise ValueError("The output path exists but is not a directory.")
|
||||
return path
|
||||
|
||||
|
||||
def existing_input_paths(args: list[str], *, print_missing: bool = False) -> list[Path]:
|
||||
|
||||
Reference in new issue
Block a user