Update zsh completions

ddusb.py

@@ -2,7 +2,6 @@
 """Wrapper script for using dd to write to a USB drive."""
 
 import argparse
-import os
 import pathlib
 import re
 import subprocess
@@ -11,10 +10,6 @@ import subprocess
 COMMENT_PATTERN = "^[#;]"
 EXCLUDE_FILE = "/etc/helper-scripts/ddusb-exclude.conf"
 
-E_BLOCKDEVICE_ERROR = 1
-E_EXCLUDE_ERROR = 2
-E_DD_ERROR = 3
-
 
 # ========== Functions ==========
 def read_exclude_file(exclude_file):
@@ -51,7 +46,7 @@ block_path = args.output_file
 # Ensure that block_path is really a block device
 if not pathlib.Path(block_path).is_block_device():
     print(f'Error: "{block_path}" is not a block device')
-    exit(E_BLOCKDEVICE_ERROR)
+    exit(1)
 
 # Check if block_path is excluded
 exclude_patterns = read_exclude_file(EXCLUDE_FILE)
@@ -59,7 +54,7 @@ exclude_patterns = read_exclude_file(EXCLUDE_FILE)
 for pattern in exclude_patterns:
     if re.fullmatch(pattern, block_path):
         print(f'Error: "{block_path}" is blacklisted from running dd')
-        exit(E_EXCLUDE_ERROR)
+        exit(2)
 
 print(f"Input file: {input_file}")
 print(f"Block device: {block_path}")
@@ -77,6 +72,6 @@ try:
         check=True,
     )
 except subprocess.CalledProcessError:
-    exit(E_DD_ERROR)
+    exit(3)
 else:
-    os.sync()
+    subprocess.run("sync")

quickdel.py

@@ -1,157 +0,0 @@
-#!/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
-* -i, --no-ignore
-* -I, --no-ignore-vcs
-* -l, --links-only
-"""
-
-import argparse
-import os
-import os.path
-import re
-import subprocess
-
-from termcolor import colored
-
-# ========== Constants ==========
-FD_BIN = "/usr/bin/fd"
-FD_OPTS = []
-# Matches 'y' or 'yes' only, ignoring case
-USER_RESPONSE_YES = "^[Yy]{1}([Ee]{1}[Ss]{1})?$"
-
-E_USER_RESPONSE_NO = 1
-E_INPUT_INTERRUPTED = 2
-
-# ========== 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", "directories"],
-        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(
-        "-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.extend(
-            subprocess.run(
-                cmd, capture_output=True, text=True
-            ).stdout.splitlines()
-        )
-    files.sort()
-
-    # Pretty print all filenames
-    for index, filename in enumerate([color_file(f) for f in files], 1):
-        print(f"{index}. {filename}")
-
-    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)
-
-
-    for f in files:
-        os.remove(f)
-
-    print("All files deleted")

zsh/completions/_fedit

@@ -2,11 +2,11 @@
 local arguments
 
 arguments=(
-  {-h,--help}'[show this help message and exit]'
+  {-h, --help}'[show this help message and exit]'
-  {-b,--boot}'[edit a file in /boot]'
+  {-b, --boot}'[edit a file in /boot]'
-  {-d,--dir}'[edit a file in a given directory]'
+  {-d, --dir}'[edit a file in a given directory]'
-  {-E,--etc}'[edit a file in /etc]'
+  {-E, --etc}'[edit a file in /etc]'
-  {-e,--editor}'[use a given editor]'
+  {-e, --editor}'[use a given editor]'
   '*:filename:_files'
 )
 

zsh/completions/_quickdel

@@ -4,16 +4,11 @@
 local arguments
 
 arguments=(
-  {-d,--directories-only}'[filter results to directories]'
+  {-d,--directories-only}'[only delete directories]'
-  {-e,--empty-only}'[filter results to empty files and directories]'
-  {-f,--files-only}'[filter results to files]'
-  {-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