Refactoring of code and update of zsh plugin for fedit script

fedit.py

@@ -14,27 +14,31 @@ import shutil
 import subprocess
 
 # ========== Constants ==========
-# Paths
+# ----- Paths -----
 BOOT_DIR = "/boot"
 ETC_DIR = "/etc"
 
-# Exit Codes
+# ----- Exit Codes -----
 E_NOEDITORFOUND = 2
 E_NOFILESELECTED = 3
 
-# Commands
+# ----- Commands -----
 FIND_CMD = "/usr/bin/fd"
-FIND_OPTS = ["--hidden", "--print0", "--type", "f", "--no-ignore-vcs"]
-FZF_CMD = "/usr/bin/fzf"
-FZF_OPTS = ["--read0", "--select-1", "--exit-0", "--print0"]
+FIND_OPTS = ["--hidden", "--print0", "--type", "f"]
+EXTRA_FIND_OPTS = {"no_ignore_vcs": "--no-ignore", "no_ignore": "--no-ignore-vcs"}
+
 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(editor_override=None):
+def select_editor(override=None):
     """Return a possible canonical path to an editor.
     Select an editor from one of:
     * -e, --editor
@@ -45,15 +49,15 @@ def select_editor(editor_override=None):
 
     If an editor cannot be resolved, then an Error is raised instead.
 
-    :param editor_override: argument to override an editor
+    :param 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 editor_override is not None:
-        editor = shutil.which(editor_override)
+    if override is not None:
+        editor = shutil.which(override)
     elif "EDITOR" in os.environ:
         editor = shutil.which(os.environ.get("EDITOR"))
     elif shutil.which("vim") is not None:
@@ -69,12 +73,16 @@ 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:
@@ -90,21 +98,24 @@ 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(directory=None):
+def find_files(opts, 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] + FIND_OPTS
+    cmd = [FIND_CMD, *opts]
+
     if directory is not None:
         cmd.extend(["--", ".", directory])
 
@@ -126,51 +137,73 @@ def locate_files(patterns):
 
 
 # ========== Main Script ==========
-parser = argparse.ArgumentParser()
-parser.add_argument(
-    "-b",
-    "--boot",
-    action="store_const",
-    const=BOOT_DIR,
-    dest="dir",
-    help="edit a file in /boot",
-)
-parser.add_argument(
-    "-d", "--dir", dest="dir", type=str, help="edit a file in a given directory"
-)
-parser.add_argument(
-    "-E",
-    "--etc",
-    action="store_const",
-    const=ETC_DIR,
-    dest="dir",
-    help="edit a file in /etc",
-)
-parser.add_argument("-e", "--editor", help="use a given editor")
-parser.add_argument("patterns", type=str, nargs="*", help="patterns to pass to locate")
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-b",
+        "--boot",
+        action="store_const",
+        const=BOOT_DIR,
+        dest="dir",
+        help="edit a file in /boot",
+    )
+    parser.add_argument(
+        "-d", "--dir", dest="dir", type=str, help="edit a file in a given directory"
+    )
+    parser.add_argument(
+        "-E",
+        "--etc",
+        action="store_const",
+        const=ETC_DIR,
+        dest="dir",
+        help="edit a file in /etc",
+    )
+    parser.add_argument(
+        "-I",
+        "--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()
 
-final_find_cmd = [FIND_CMD] + FIND_OPTS
-editor = ""
+    user_opts = [] if args.extra_find_opts is None else args.extra_find_opts
+    user_opts.extend(FIND_OPTS)
 
-try:
-    editor = select_editor(args.editor)
-except FileNotFoundError as e:
-    print(e)
-    exit(E_NOEDITORFOUND)
+    editor = ""
 
-# If patterns were passed, use locate
-# Otherwise check for -d and use fd
-if not args.patterns == []:
-    files = locate_files(args.patterns)
-else:
-    files = find_files(args.dir)
+    try:
+        editor = select_editor(args.editor)
+    except FileNotFoundError as e:
+        print(e)
+        exit(E_NOEDITORFOUND)
 
-selected_file = run_fzf(files)
+    # If patterns were passed, use locate
+    # Otherwise check for -d and use fd
+    files = (
+        find_files(user_opts, args.dir)
+        if not args.patterns
+        else locate_files(args.patterns)
+    )
 
-if not selected_file == "":
-    cmd = gen_editor_cmd(selected_file)
-    subprocess.run(cmd)
-else:
-    exit(E_NOFILESELECTED)
+    selected_file = run_fzf(files)
+
+    if selected_file != "":
+        cmd = gen_editor_cmd(selected_file)
+        subprocess.run(cmd)
+    else:
+        exit(E_NOFILESELECTED)

quickdel.py

@@ -0,0 +1,182 @@
+#!/usr/bin/python3
+"""
+quickdel - delete any file matching a query
+
+Dependencies
+============
+* fd
+* python-termcolor
+
+Command-Line Arguments
+======================
+* -d, --directories-only
+* -D, --directory       TODO: implement this
+* -e, --empty-only
+* -E, --extension
+* -f, --files-only
+* -F, --force-directory-delete
+* -i, --no-ignore
+* -I, --no-ignore-vcs
+* -l, --links-only
+"""
+
+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"]
+# Matches 'y' or 'yes' only, ignoring case
+USER_RESPONSE_YES = "^[Yy]{1}([Ee]{1}[Ss]{1})?$"
+
+E_NO_RESULTS = 1
+E_USER_RESPONSE_NO = 2
+E_INPUT_INTERRUPTED = 3
+
+
+# ========== Functions ==========
+def color_file(filename):
+    """Return correct color code for filetype of filename.
+
+    Example
+    -------
+    >>> color_file('Test File', 'red')
+    '\x1b[31mTest String\x1b[0m'
+
+    :param filename: file to determine color output for
+    :type filename: str
+    :return: filename with ANSII escape codes for color
+    :rtype: str
+    """
+    if os.path.isdir(filename):
+        return colored(filename, "blue")
+    elif os.path.islink(filename):
+        return colored(filename, "green")
+    else:
+        return filename
+
+
+# ========== Main Script ==========
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-d",
+        "--directories-only",
+        action="store_const",
+        const=["--type", "directory"],
+        dest="fd_extra_opts",
+        help="filter results to directories",
+    )
+    parser.add_argument(
+        "-e",
+        "--empty-only",
+        action="store_const",
+        const=["--type", "empty"],
+        dest="fd_extra_opts",
+        help="filter results to empty files and directories",
+    )
+    parser.add_argument(
+        "-E",
+        "--extension",
+        action="append",
+        dest="extensions",
+        help="file extension",
+        metavar="ext",
+    )
+    parser.add_argument(
+        "-f",
+        "--files-only",
+        action="store_const",
+        const=["--type", "file"],
+        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",
+        action="store_const",
+        const="--no-ignore-vcs",
+        dest="fd_extra_opts",
+        help="do not ignore .gitignore",
+    )
+    parser.add_argument(
+        "-i",
+        "--no-ignore",
+        action="store_const",
+        const="--no-ignore",
+        dest="fd_extra_opts",
+        help="do not ignore .gitignore and .fdignore",
+    )
+    parser.add_argument(
+        "-l",
+        "--links-only",
+        action="store_const",
+        const=["--type", "symlink"],
+        dest="fd_extra_opts",
+        help="filter results to symlinks",
+    )
+    parser.add_argument("patterns", nargs="+", help="file matching patterns")
+
+    args = parser.parse_args()
+
+    if args.fd_extra_opts is not None:
+        FD_OPTS.extend(args.fd_extra_opts)
+    if args.extensions is not None:
+        for ext in args.extensions:
+            FD_OPTS.extend(["--extension", ext])
+
+    files = {}
+    for pattern in args.patterns:
+        cmd = [FD_BIN, *FD_OPTS, pattern]
+        files.update(
+            subprocess.run(cmd, capture_output=True, text=True).stdout.splitlines()
+        )
+    files = sorted(files)
+
+    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? ")
+    except KeyboardInterrupt:
+        exit(E_INPUT_INTERRUPTED)
+
+    if re.match(USER_RESPONSE_YES, user_response) is None:
+        print("Operation cancelled")
+        exit(E_USER_RESPONSE_NO)
+
+    # Remove files first
+    for f in [fi for fi in files if os.path.isfile(fi)]:
+        os.remove(f)
+
+    # Check -f, --force-directory-delete option
+    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,6 +7,8 @@ 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

@@ -4,11 +4,17 @@
 local arguments
 
 arguments=(
-  {-d,--directories-only}'[only delete directories]'
+  {-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]'
   {-I,--no-ignore-vcs}'[do not ignore .gitignore]'
+  {-l,--links-only}'[filter results to symlinks]'
   '*:filename:_files'
 )
 
+
 _arguments -s $arguments