3 Commits

Author SHA1 Message Date
f2a45a7ca3 Check for KeyboardInterrupt 2019-04-17 18:55:51 -07:00
61250fed0d Prefix regex strings with 'r' 2019-03-25 14:00:52 -07:00
af39e1d81e Fix incorrect type being used for temporary file list 2019-03-20 16:46:33 -07:00
3 changed files with 8 additions and 4 deletions

View File

@ -8,7 +8,7 @@ import re
import subprocess import subprocess
# ========== Constants ========== # ========== Constants ==========
COMMENT_PATTERN = "^[#;]" COMMENT_PATTERN = r"^[#;]"
EXCLUDE_FILE = "/etc/helper-scripts/ddusb-exclude.conf" EXCLUDE_FILE = "/etc/helper-scripts/ddusb-exclude.conf"
E_BLOCKDEVICE_ERROR = 1 E_BLOCKDEVICE_ERROR = 1

View File

@ -19,6 +19,7 @@ BOOT_DIR = "/boot"
ETC_DIR = "/etc" ETC_DIR = "/etc"
# ----- Exit Codes ----- # ----- Exit Codes -----
E_INTERRUPT = 1
E_NOEDITORFOUND = 2 E_NOEDITORFOUND = 2
E_NOFILESELECTED = 3 E_NOFILESELECTED = 3
@ -200,7 +201,10 @@ if __name__ == "__main__":
else locate_files(args.patterns) else locate_files(args.patterns)
) )
selected_file = run_fzf(files) try:
selected_file = run_fzf(files)
except KeyboardInterrupt:
exit(E_INTERRUPT)
if selected_file != "": if selected_file != "":
cmd = gen_editor_cmd(selected_file) cmd = gen_editor_cmd(selected_file)

View File

@ -33,7 +33,7 @@ from termcolor import colored
FD_BIN = "/usr/bin/fd" FD_BIN = "/usr/bin/fd"
FD_OPTS = ["--hidden"] FD_OPTS = ["--hidden"]
# Matches 'y' or 'yes' only, ignoring case # Matches 'y' or 'yes' only, ignoring case
USER_RESPONSE_YES = "^[Yy]{1}([Ee]{1}[Ss]{1})?$" USER_RESPONSE_YES = r"^[Yy]{1}([Ee]{1}[Ss]{1})?$"
E_NO_RESULTS = 1 E_NO_RESULTS = 1
E_USER_RESPONSE_NO = 2 E_USER_RESPONSE_NO = 2
@ -137,7 +137,7 @@ if __name__ == "__main__":
for ext in args.extensions: for ext in args.extensions:
FD_OPTS.extend(["--extension", ext]) FD_OPTS.extend(["--extension", ext])
files = {} files = set()
for pattern in args.patterns: for pattern in args.patterns:
cmd = [FD_BIN, *FD_OPTS, pattern] cmd = [FD_BIN, *FD_OPTS, pattern]
files.update( files.update(