Update zsh completions

audiotrim.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/bash
+# Trim an audio file given a startpoint and an endpoint
+# Dependencies: ffmpeg
+
+printHelp() {
+cat << EOF
+Usage: audiotrim [input file] [start time] [stop time] [output file]
+
+Options:
+    -h  show this help page
+EOF
+}
+
+while true; do
+    case "${1}" in
+        '-h'|'--help')
+            printHelp
+            exit
+            ;;
+        --)
+            shift
+            break
+            ;;
+        -*)
+            printf '%s\n' "Unknown option: ${1}"
+            exit 1
+            ;;
+        *)
+            break
+            ;;
+    esac
+done
+
+if [[ ! -x '/usr/bin/ffmpeg' ]]; then
+    printf '%s\n' 'ffmpeg program is not installed' >&2
+    exit 1
+fi
+
+readonly infile="${1}"
+readonly starttime="${2}"
+readonly stoptime="${3}"
+readonly outfile="${4}"
+readonly format="${1%.*}"
+
+[[ -z "${infile}" ]] && printf '%s\n' "No file entered." >&2 exit 2
+[[ ! -f "${infile}" ]] && printf '%s\n' "Not a file: ${infile}" >&2 exit 3
+
+ffmpeg -i "${infile}" -ss "${starttime}" -to "${stoptime}" -c copy "${outfile:-"${outfile%.*}-trimmed.${format}"}"

ddusb.py

@@ -2,19 +2,14 @@
 """Wrapper script for using dd to write to a USB drive."""
 
 import argparse
-import os
 import pathlib
 import re
 import subprocess
 
 # ========== Constants ==========
-COMMENT_PATTERN = r"^[#;]"
+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")

dlaudio.py

@@ -0,0 +1,57 @@
+#!/usr/bin/python3
+"""Download audio using youtube-dl.
+
+Dependencies:
+=============
+* youtube-dl
+"""
+
+import argparse
+import pathlib
+import shutil
+import subprocess
+
+# =========== Constants ==========
+YOUTUBE_DL_BIN = shutil.which("youtube-dl")
+DEFAULT_FILENAME = f"{pathlib.Path.home()}/Music/%(title)s.%(ext)s"
+
+# ========== Error Codes ==========
+E_NOURLS = 2
+
+# ========== Main Script ==========
+parser = argparse.ArgumentParser()
+parser.add_argument("-b", "--batchfile", help="provide the links from a text file")
+parser.add_argument(
+    "-f", "--format", type=str, default="opus", help="the format to use"
+)
+parser.add_argument(
+    "-n", "--filename", type=str, help="downloaded filename (without extension)"
+)
+parser.add_argument("urls", nargs="*", help="video URLs")
+args = parser.parse_args()
+
+dl_opts = [
+    YOUTUBE_DL_BIN,
+    "--no-part",
+    "--no-continue",
+    "--extract-audio",
+    f"--audio-format={args.format}",
+]
+
+# filename handling
+# if -b is used, DEFAULT_FILENAME must take precedence
+if args.filename is not None and args.batchfile is None:
+    dl_opts.append(f"--output={args.filename}")
+else:
+    dl_opts.append(f"--output={DEFAULT_FILENAME}")
+
+# URL handling
+if args.batchfile is not None:
+    dl_opts.append(f"--batch-file={args.batchfile}")
+elif args.urls is not None:
+    dl_opts.extend(args.urls)
+else:
+    print("URLs are required")
+    exit(E_NOURLS)
+
+subprocess.run(dl_opts)

fedit.py

@@ -14,32 +14,27 @@ import shutil
 import subprocess
 
 # ========== Constants ==========
-# ----- Paths -----
+# Paths
 BOOT_DIR = "/boot"
 ETC_DIR = "/etc"
 
-# ----- Exit Codes -----
-E_INTERRUPT = 1
+# Exit Codes
 E_NOEDITORFOUND = 2
 E_NOFILESELECTED = 3
 
-# ----- Commands -----
+# Commands
 FIND_CMD = "/usr/bin/fd"
-FIND_OPTS = ["--hidden", "--print0", "--type", "f"]
-EXTRA_FIND_OPTS = {"no_ignore_vcs": "--no-ignore", "no_ignore": "--no-ignore-vcs"}
-
+FIND_OPTS = ["--hidden", "--print0", "--type", "f", "--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:
-        editor = shutil.which(override)
+    if editor_override is not None:
+        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
-    # What happens if the file or its metadata changes?
+    # possible for a race condition to occur here
     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.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"
-    )
+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")
 
-    args = parser.parse_args()
+args = parser.parse_args()
 
-    user_opts = [] if args.extra_find_opts is None else args.extra_find_opts
-    user_opts.extend(FIND_OPTS)
+final_find_cmd = [FIND_CMD] + FIND_OPTS
+editor = ""
 
-    editor = ""
+try:
+    editor = select_editor(args.editor)
+except FileNotFoundError as e:
+    print(e)
+    exit(E_NOEDITORFOUND)
 
-    try:
-        editor = select_editor(args.editor)
-    except FileNotFoundError as e:
-        print(e)
-        exit(E_NOEDITORFOUND)
+# 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)
 
-    # 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)
-    )
+selected_file = run_fzf(files)
 
-    try:
-        selected_file = run_fzf(files)
-    except KeyboardInterrupt:
-        exit(E_INTERRUPT)
-
-    if selected_file != "":
-        cmd = gen_editor_cmd(selected_file)
-        subprocess.run(cmd)
-    else:
-        exit(E_NOFILESELECTED)
+if not selected_file == "":
+    cmd = gen_editor_cmd(selected_file)
+    subprocess.run(cmd)
+else:
+    exit(E_NOFILESELECTED)

quickdel.py

@@ -1,182 +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
-* -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 = r"^[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 = set()
-    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/_dlaudio

@@ -0,0 +1,14 @@
+#compdef dlaudio
+
+# zsh completions for 'dlaudio'
+local arguments
+
+arguments=(
+  {-h,--help}'[show this help message and exit]'
+  {-b,--batch-dl}'[provide the links from a text file]'
+  {-f,--format}'[the format to use (default:flac)]'
+  {-n,--filename}'[the name of the downloaded file (without extension)]'
+  '*:filename:_files'
+)
+
+_arguments -s $arguments

zsh/completions/_fedit

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

zsh/completions/_quickdel

@@ -4,17 +4,11 @@
 local arguments
 
 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]'
+  {-d,--directories-only}'[only delete directories]'
   {-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