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

Remove unnecessary handling of passed in files to url_hints

Browse Source
This commit is contained in:
Kovid Goyal 2018-04-12 09:04:54 +05:30
parent 21b7bf6009
commit 038248f55d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kittens/url_hints/main.py
View File

@ -180,13 +180,7 @@ def run_loop(args, lines, index_map):
raise SystemExit(loop.return_code) raise SystemExit(loop.return_code)
def run(args, source_file=None): def run(args, text):
if source_file is None:
text = sys.stdin.buffer.read().decode('utf-8')
sys.stdin = open('/dev/tty')
else:
with open(source_file, 'r') as f:
text = f.read()
if args.regex is None: if args.regex is None:
from .url_regex import url_delimiters from .url_regex import url_delimiters
url_pat = '(?:{})://[^{}]{{3,}}'.format( url_pat = '(?:{})://[^{}]{{3,}}'.format(
@ -233,14 +227,26 @@ Comma separated list of recognized URL prefixes. Defaults to:
def main(args): def main(args):
msg = 'Highlight URLs inside the specified text' msg = 'Select text from the screen using the keyboard'
try: text = None
args, items = parse_args(args[1:], OPTIONS, '[path to file or omit to use stdin]', msg, 'url_hints') if sys.stdin.isatty():
except SystemExit as e: print('You must pass the text to be hinted on STDIN', file=sys.stderr)
print(e.args[0], file=sys.stderr)
input(_('Press Enter to quit')) input(_('Press Enter to quit'))
return 1 return
return run(args, (items or [None])[0]) text = sys.stdin.buffer.read().decode('utf-8')
sys.stdin = open('/dev/tty')
try:
args, items = parse_args(args[1:], OPTIONS, '', msg, 'url_hints')
except SystemExit as e:
if e.code != 0:
print(e.args[0], file=sys.stderr)
input(_('Press Enter to quit'))
return
if items:
print('Extra command line arguments present: {}'.format(' '.join(items)), file=sys.stderr)
input(_('Press Enter to quit'))
return
return run(args, text)
def handle_result(args, data, target_window_id, boss): def handle_result(args, data, target_window_id, boss):