From 4edf43891c53b52f62781bd7e09089cc5daacd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 27 Dec 2021 23:31:54 +0100 Subject: [PATCH] add -d/--directory and -f/--filename command-line arguments --- gallery_dl/__init__.py | 7 +++++++ gallery_dl/option.py | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gallery_dl/__init__.py b/gallery_dl/__init__.py index a51acb3d..ad8286ed 100644 --- a/gallery_dl/__init__.py +++ b/gallery_dl/__init__.py @@ -115,6 +115,13 @@ def main(): config.load(args.cfgfiles, strict=True) if args.yamlfiles: config.load(args.yamlfiles, strict=True, fmt="yaml") + if args.filename: + if args.filename == "/O": + args.filename = "{filename}.{extension}" + config.set((), "filename", args.filename) + if args.directory: + config.set((), "base-directory", args.directory) + config.set((), "directory", ()) if args.postprocessors: config.set((), "postprocessors", args.postprocessors) if args.abort: diff --git a/gallery_dl/option.py b/gallery_dl/option.py index 0126228f..1967bf7f 100644 --- a/gallery_dl/option.py +++ b/gallery_dl/option.py @@ -92,9 +92,9 @@ def build_parser(): help="Print program version and exit", ) general.add_argument( - "-d", "--dest", + "--dest", dest="base-directory", metavar="DEST", action=ConfigAction, - help="Destination directory", + help=argparse.SUPPRESS, ) general.add_argument( "-i", "--input-file", @@ -102,6 +102,17 @@ def build_parser(): help=("Download URLs found in FILE ('-' for stdin). " "More than one --input-file can be specified"), ) + general.add_argument( + "-f", "--filename", + dest="filename", metavar="FORMAT", + help=("Filename format string for downloaded files " + "('/O' for \"original\" filenames)"), + ) + general.add_argument( + "-d", "--directory", + dest="directory", metavar="PATH", + help="Target location for file downloads", + ) general.add_argument( "--cookies", dest="cookies", metavar="FILE", action=ConfigAction,