KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle SIGINT more gracefully

Browse Source
This commit is contained in:
Kovid Goyal 2020-09-25 18:55:43 +05:30
parent 2a8c8c0cbb
commit 6c8a4f8d9f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
kittens/hyperlinked_grep/main.py
View File

@ -4,6 +4,7 @@
import os import os
import re import re
import signal
import socket import socket
import subprocess import subprocess
import sys import sys
@ -12,14 +13,11 @@ from urllib.parse import quote_from_bytes
def write_hyperlink(write: Callable[[bytes], None], url: bytes, line: bytes, frag: bytes = b'') -> None: def write_hyperlink(write: Callable[[bytes], None], url: bytes, line: bytes, frag: bytes = b'') -> None:
write(b'\033]8;;') text = b'\033]8;;' + url
write(url)
if frag: if frag:
write(b'#') text += b'#' + frag
write(frag) text += b'\033\\' + line + b'\033]8;;\033\\'
write(b'\033\\') write(text)
write(line)
write(b'\033]8;;\033\\')
def main() -> None: def main() -> None:
@ -36,24 +34,28 @@ def main() -> None:
in_result: bytes = b'' in_result: bytes = b''
hostname = socket.gethostname().encode('utf-8') hostname = socket.gethostname().encode('utf-8')
for line in p.stdout: try:
line = osc_pat.sub(b'', line) # remove any existing hyperlinks for line in p.stdout:
clean_line = sgr_pat.sub(b'', line).rstrip() # remove SGR formatting line = osc_pat.sub(b'', line) # remove any existing hyperlinks
if not clean_line: clean_line = sgr_pat.sub(b'', line).rstrip() # remove SGR formatting
in_result = b'' if not clean_line:
write(b'\n') in_result = b''
continue write(b'\n')
if in_result: continue
m = num_pat.match(clean_line) if in_result:
if m is not None: m = num_pat.match(clean_line)
write_hyperlink(write, in_result, line, frag=m.group(1)) if m is not None:
else: write_hyperlink(write, in_result, line, frag=m.group(1))
if line.strip():
path = quote_from_bytes(os.path.abspath(clean_line)).encode('utf-8')
in_result = b'file://' + hostname + path
write_hyperlink(write, in_result, line)
else: else:
write(line) if line.strip():
path = quote_from_bytes(os.path.abspath(clean_line)).encode('utf-8')
in_result = b'file://' + hostname + path
write_hyperlink(write, in_result, line)
else:
write(line)
except KeyboardInterrupt:
p.send_signal(signal.SIGINT)
p.stdout.close()
raise SystemExit(p.wait()) raise SystemExit(p.wait())