Reimplement quickdel script in python

ddusb.py

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

fedit.py

@@ -14,32 +14,27 @@ import shutil
 import subprocess
 
 # ========== Constants ==========
-# ----- Paths -----
+# Paths
 BOOT_DIR = "/boot"
 ETC_DIR = "/etc"
 
-# ----- Exit Codes -----
+# Exit Codes
-E_INTERRUPT = 1
 E_NOEDITORFOUND = 2
 E_NOFILESELECTED = 3
 
-# ----- Commands -----
+# Commands
 FIND_CMD = "/usr/bin/fd"
-FIND_OPTS = ["--hidden", "--print0", "--type", "f"]
+FIND_OPTS = ["--hidden", "--print0", "--type", "f", "--no-ignore-vcs"]
-EXTRA_FIND_OPTS = {"no_ignore_vcs": "--no-ignore", "no_ignore": "--no-ignore-vcs"}
+FZF_CMD = "/usr/bin/fzf"
-
+FZF_OPTS = ["--read0", "--select-1", "--exit-0", "--print0"]
 LOCATE_CMD = "/usr/bin/locate"
 LOCATE_OPTS = ["--all", "--ignore-case", "--null"]
 
-FZF_CMD = "/usr/bin/fzf"
-FZF_OPTS = ["--read0", "--select-1", "--exit-0", "--print0"]
-
-# ----- Misc. -----
 LOCALE = "utf-8"
 
 
 # ========== Functions ==========
-def select_editor(override=None):
+def select_editor(editor_override=None):
     """Return a possible canonical path to an editor.
     Select an editor from one of:
     * -e, --editor
@@ -50,15 +45,15 @@ def select_editor(override=None):
 
     If an editor cannot be resolved, then an Error is raised instead.
 
-    :param override: argument to override an editor
+    :param editor_override: argument to override an editor
     :returns: path to one of these editors
     :rtype: str
     :raises: FileNotFoundError if an editor could not be resolved
     """
     editor = None
 
-    if override is not None:
+    if editor_override is not None:
-        editor = shutil.which(override)
+        editor = shutil.which(editor_override)
     elif "EDITOR" in os.environ:
         editor = shutil.which(os.environ.get("EDITOR"))
     elif shutil.which("vim") is not None:
@@ -74,16 +69,12 @@ def gen_editor_cmd(filename):
     """Generate a command line to run for editing a file based on
     permissions.
 
-    This command does not pass extra options to the editor, hence
-    there are no arguments to pass for options.
-
     :param filename: name of file to edit
     :type filename: str or path-like object
     :returns: command to execute to edit file
     :rtype: list
     """
-    # Possible for a race condition to occur here
+    # possible for a race condition to occur here
-    # What happens if the file or its metadata changes?
     if os.access(filename, os.W_OK):
         return [editor, filename]
     else:
@@ -99,24 +90,21 @@ def run_fzf(files):
     :rtype: str
     """
     selected_file = subprocess.run(
-        [FZF_CMD, *FZF_OPTS], input=files, stdout=subprocess.PIPE
+        [FZF_CMD] + FZF_OPTS, input=files, stdout=subprocess.PIPE
     ).stdout
 
     return selected_file.decode(LOCALE).strip("\x00")
 
 
-def find_files(opts, directory=None):
+def find_files(directory=None):
     """Use a find-based program to locate files, then pass to fzf.
 
-    :param opts: options to pass to the find program
-    :type opts: list of str
     :param directory: directory to search for files
     :type directory: str
     :returns: path of user-selected file
     :rtype: bytes
     """
-    cmd = [FIND_CMD, *opts]
+    cmd = [FIND_CMD] + FIND_OPTS
-
     if directory is not None:
         cmd.extend(["--", ".", directory])
 
@@ -138,76 +126,51 @@ def locate_files(patterns):
 
 
 # ========== Main Script ==========
-if __name__ == "__main__":
+parser = argparse.ArgumentParser()
-    parser = argparse.ArgumentParser()
+parser.add_argument(
-    parser.add_argument(
     "-b",
     "--boot",
     action="store_const",
     const=BOOT_DIR,
     dest="dir",
     help="edit a file in /boot",
-    )
+)
-    parser.add_argument(
+parser.add_argument(
     "-d", "--dir", dest="dir", type=str, help="edit a file in a given directory"
-    )
+)
-    parser.add_argument(
+parser.add_argument(
     "-E",
     "--etc",
     action="store_const",
     const=ETC_DIR,
     dest="dir",
     help="edit a file in /etc",
-    )
+)
-    parser.add_argument(
+parser.add_argument("-e", "--editor", help="use a given editor")
-        "-I",
+parser.add_argument("patterns", type=str, nargs="*", help="patterns to pass to locate")
-        "--no-ignore",
-        action="append_const",
-        const="--no-ignore",
-        dest="extra_find_opts",
-        help="do not respect .(git|fd)ignore files",
-    )
-    parser.add_argument(
-        "-i",
-        "--no-ignore-vcs",
-        action="append_const",
-        const="--no-ignore-vcs",
-        dest="extra_find_opts",
-        help="do not respect .gitignore files",
-    )
-    parser.add_argument("-e", "--editor", help="use a given editor")
-    parser.add_argument(
-        "patterns", type=str, nargs="*", help="patterns to pass to locate"
-    )
 
-    args = parser.parse_args()
+args = parser.parse_args()
 
-    user_opts = [] if args.extra_find_opts is None else args.extra_find_opts
+final_find_cmd = [FIND_CMD] + FIND_OPTS
-    user_opts.extend(FIND_OPTS)
+editor = ""
 
-    editor = ""
+try:
-
-    try:
     editor = select_editor(args.editor)
-    except FileNotFoundError as e:
+except FileNotFoundError as e:
     print(e)
     exit(E_NOEDITORFOUND)
 
-    # If patterns were passed, use locate
+# If patterns were passed, use locate
-    # Otherwise check for -d and use fd
+# Otherwise check for -d and use fd
-    files = (
+if not args.patterns == []:
-        find_files(user_opts, args.dir)
+    files = locate_files(args.patterns)
-        if not args.patterns
+else:
-        else locate_files(args.patterns)
+    files = find_files(args.dir)
-    )
 
-    try:
+selected_file = run_fzf(files)
-        selected_file = run_fzf(files)
-    except KeyboardInterrupt:
-        exit(E_INTERRUPT)
 
-    if selected_file != "":
+if not selected_file == "":
     cmd = gen_editor_cmd(selected_file)
     subprocess.run(cmd)
-    else:
+else:
     exit(E_NOFILESELECTED)

quickdel.py

@@ -14,7 +14,6 @@ Command-Line Arguments
 * -e, --empty-only
 * -E, --extension
 * -f, --files-only
-* -F, --force-directory-delete
 * -i, --no-ignore
 * -I, --no-ignore-vcs
 * -l, --links-only
@@ -24,21 +23,18 @@ import argparse
 import os
 import os.path
 import re
-import shutil
 import subprocess
 
 from termcolor import colored
 
 # ========== Constants ==========
 FD_BIN = "/usr/bin/fd"
-FD_OPTS = ["--hidden"]
+FD_OPTS = []
 # Matches 'y' or 'yes' only, ignoring case
-USER_RESPONSE_YES = r"^[Yy]{1}([Ee]{1}[Ss]{1})?$"
+USER_RESPONSE_YES = "^[Yy]{1}([Ee]{1}[Ss]{1})?$"
-
-E_NO_RESULTS = 1
-E_USER_RESPONSE_NO = 2
-E_INPUT_INTERRUPTED = 3
 
+E_USER_RESPONSE_NO = 1
+E_INPUT_INTERRUPTED = 2
 
 # ========== Functions ==========
 def color_file(filename):
@@ -69,7 +65,7 @@ if __name__ == "__main__":
         "-d",
         "--directories-only",
         action="store_const",
-        const=["--type", "directory"],
+        const=["--type", "directories"],
         dest="fd_extra_opts",
         help="filter results to directories",
     )
@@ -87,7 +83,7 @@ if __name__ == "__main__":
         action="append",
         dest="extensions",
         help="file extension",
-        metavar="ext",
+        metavar='ext',
     )
     parser.add_argument(
         "-f",
@@ -97,12 +93,6 @@ if __name__ == "__main__":
         dest="fd_extra_opts",
         help="filter results to files",
     )
-    parser.add_argument(
-        "-F",
-        "--force-directory-delete",
-        action="store_true",
-        help="do not ignore non-empty directories, delete anyways",
-    )
     parser.add_argument(
         "-I",
         "--no-ignore-vcs",
@@ -137,23 +127,19 @@ if __name__ == "__main__":
         for ext in args.extensions:
             FD_OPTS.extend(["--extension", ext])
 
-    files = set()
+    files = []
     for pattern in args.patterns:
         cmd = [FD_BIN, *FD_OPTS, pattern]
-        files.update(
+        files.extend(
-            subprocess.run(cmd, capture_output=True, text=True).stdout.splitlines()
+            subprocess.run(
+                cmd, capture_output=True, text=True
+            ).stdout.splitlines()
         )
-    files = sorted(files)
+    files.sort()
-
-    if files == []:
-        print(f"No results found, exiting")
-        exit(E_NO_RESULTS)
 
     # Pretty print all filenames
     for index, filename in enumerate([color_file(f) for f in files], 1):
         print(f"{index}. {filename}")
-    # Padding line
-    print()
 
     try:
         user_response = input("Would you like to delete these files? ")
@@ -164,19 +150,8 @@ if __name__ == "__main__":
         print("Operation cancelled")
         exit(E_USER_RESPONSE_NO)
 
-    # Remove files first
+
-    for f in [fi for fi in files if os.path.isfile(fi)]:
+    for f in files:
         os.remove(f)
 
-    # Check -f, --force-directory-delete option
+    print("All files deleted")
-    rmdir_func = shutil.rmtree if args.force_directory_delete else os.rmdir
-
-    for d in filter(os.path.isdir, files):
-        try:
-            rmdir_func(d)
-        except OSError:
-            print(
-                f"{colored('Warning', 'yellow')}: {colored(d, 'blue')} is not empty, not deleting directory"
-            )
-
-    print(colored("\nDeletions complete", "green"))

zsh/completions/_fedit

@@ -7,8 +7,6 @@ arguments=(
   {-d,--dir}'[edit a file in a given directory]'
   {-E,--etc}'[edit a file in /etc]'
   {-e,--editor}'[use a given editor]'
-  {-I,--no-ignore}'[do not respect  .(git|fd)ignore files]'
-  {-i,--no-ignore-vcs}'[do not respect .gitignore files]'
   '*:filename:_files'
 )
 

zsh/completions/_quickdel

@@ -7,7 +7,6 @@ arguments=(
   {-d,--directories-only}'[filter results to directories]'
   {-e,--empty-only}'[filter results to empty files and directories]'
   {-f,--files-only}'[filter results to files]'
-  {-F,--force-directory-delete}'[do not ignore non-empty directories, delete anyways]'
   {-E,--extension}'[file extension]'
   {-h,--help}'[print this help page]'
   {-i,--no-ignore}'[do not ignore .gitignore and .fdignore]'