Pass %(ext)s when filename is provided on command line

ddusb.py

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

dlaudio.py

@@ -3,55 +3,72 @@
 
 Dependencies:
 =============
+
 * youtube-dl
 """
 
 import argparse
-import pathlib
+from pathlib import Path
-import shutil
 import subprocess
 
 # =========== Constants ==========
-YOUTUBE_DL_BIN = shutil.which("youtube-dl")
+YOUTUBE_DL_BIN = "/usr/bin/youtube-dl"
-DEFAULT_FILENAME = f"{pathlib.Path.home()}/Music/%(title)s.%(ext)s"
+DEFAULT_FILENAME = f"{Path.home() / 'Music'}/%(title)s.%(ext)s"
-
+DEFAULT_YOUTUBE_DL_OPTS = (
-# ========== 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",
+    "--audio-quality=0",
     "--no-continue",
     "--extract-audio",
-    f"--audio-format={args.format}",
+)
-]
 
-# filename handling
+# ----- Error Codes -----
-# if -b is used, DEFAULT_FILENAME must take precedence
+E_NOURLS = 2
-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)
+# ========== Functions ==========
+def parse_cmdline_arguments(**kwargs):
+    """Parse command line arguments passed to the script.
+        All kwargs are passed to ArgumentParser.parse_args().
+
+    :rtype: argparse.Namespace object
+    """
+    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")
+
+    return parser.parse_args()
+
+
+# ========== Main Script ==========
+if __name__ == "__main__":
+    args = parse_cmdline_arguments()
+
+    dl_opts = [
+        YOUTUBE_DL_BIN,
+        *DEFAULT_YOUTUBE_DL_OPTS,
+        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={Path.home() / 'Music' / args.filename}.%(ext)s")
+    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,27 +14,32 @@ 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", "--no-ignore-vcs"]
+FIND_OPTS = ["--hidden", "--print0", "--type", "f"]
-FZF_CMD = "/usr/bin/fzf"
+EXTRA_FIND_OPTS = {"no_ignore_vcs": "--no-ignore", "no_ignore": "--no-ignore-vcs"}
-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(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 +50,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:
+    if override is not None:
-        editor = shutil.which(editor_override)
+        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 +74,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 +99,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 +138,76 @@ def locate_files(patterns):
 
 
 # ========== Main Script ==========
-parser = argparse.ArgumentParser()
+if __name__ == "__main__":
-parser.add_argument(
+    parser = argparse.ArgumentParser()
-    "-b",
+    parser.add_argument(
-    "--boot",
+        "-b",
-    action="store_const",
+        "--boot",
-    const=BOOT_DIR,
+        action="store_const",
-    dest="dir",
+        const=BOOT_DIR,
-    help="edit a file in /boot",
+        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(
-)
+        "-d", "--dir", dest="dir", type=str, help="edit a file in a given directory"
-parser.add_argument(
+    )
-    "-E",
+    parser.add_argument(
-    "--etc",
+        "-E",
-    action="store_const",
+        "--etc",
-    const=ETC_DIR,
+        action="store_const",
-    dest="dir",
+        const=ETC_DIR,
-    help="edit a file in /etc",
+        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")
+    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
+    user_opts = [] if args.extra_find_opts is None else args.extra_find_opts
-editor = ""
+    user_opts.extend(FIND_OPTS)
 
-try:
+    editor = ""
-    editor = select_editor(args.editor)
-except FileNotFoundError as e:
-    print(e)
-    exit(E_NOEDITORFOUND)
 
-# If patterns were passed, use locate
+    try:
-# Otherwise check for -d and use fd
+        editor = select_editor(args.editor)
-if not args.patterns == []:
+    except FileNotFoundError as e:
-    files = locate_files(args.patterns)
+        print(e)
-else:
+        exit(E_NOEDITORFOUND)
-    files = find_files(args.dir)
 
-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 == "":
+    try:
-    cmd = gen_editor_cmd(selected_file)
+        selected_file = run_fzf(files)
-    subprocess.run(cmd)
+    except KeyboardInterrupt:
-else:
+        exit(E_INTERRUPT)
-    exit(E_NOFILESELECTED)
+
+    if selected_file != "":
+        cmd = gen_editor_cmd(selected_file)
+        subprocess.run(cmd)
+    else:
+        exit(E_NOFILESELECTED)

quickdel.py

@@ -14,6 +14,7 @@ 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
@@ -23,18 +24,21 @@ 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 = []
+FD_OPTS = ["--hidden"]
 # 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_USER_RESPONSE_NO = 2
+E_INPUT_INTERRUPTED = 3
 
-E_USER_RESPONSE_NO = 1
-E_INPUT_INTERRUPTED = 2
 
 # ========== Functions ==========
 def color_file(filename):
@@ -65,7 +69,7 @@ if __name__ == "__main__":
         "-d",
         "--directories-only",
         action="store_const",
-        const=["--type", "directories"],
+        const=["--type", "directory"],
         dest="fd_extra_opts",
         help="filter results to directories",
     )
@@ -83,7 +87,7 @@ if __name__ == "__main__":
         action="append",
         dest="extensions",
         help="file extension",
-        metavar='ext',
+        metavar="ext",
     )
     parser.add_argument(
         "-f",
@@ -93,6 +97,12 @@ 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",
@@ -127,19 +137,23 @@ if __name__ == "__main__":
         for ext in args.extensions:
             FD_OPTS.extend(["--extension", ext])
 
-    files = []
+    files = set()
     for pattern in args.patterns:
         cmd = [FD_BIN, *FD_OPTS, pattern]
-        files.extend(
+        files.update(
-            subprocess.run(
+            subprocess.run(cmd, capture_output=True, text=True).stdout.splitlines()
-                cmd, capture_output=True, text=True
-            ).stdout.splitlines()
         )
-    files.sort()
+    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? ")
@@ -150,8 +164,19 @@ if __name__ == "__main__":
         print("Operation cancelled")
         exit(E_USER_RESPONSE_NO)
 
-
+    # Remove files first
-    for f in files:
+    for f in [fi for fi in files if os.path.isfile(fi)]:
         os.remove(f)
 
-    print("All files deleted")
+    # 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

@@ -7,6 +7,7 @@ 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]'