mirror of
https://github.com/mikf/gallery-dl.git
synced 2025-01-31 19:51:34 +01:00
add '-J/--resolve-json' command-line option (#5864)
This commit is contained in:
parent
70f18b7a78
commit
8ecd408f53
@ -40,6 +40,8 @@
|
|||||||
-G, --resolve-urls Print URLs instead of downloading; resolve
|
-G, --resolve-urls Print URLs instead of downloading; resolve
|
||||||
intermediary URLs
|
intermediary URLs
|
||||||
-j, --dump-json Print JSON information
|
-j, --dump-json Print JSON information
|
||||||
|
-J, --resolve-json Print JSON information; resolve intermediary
|
||||||
|
URLs
|
||||||
-s, --simulate Simulate data extraction; do not download
|
-s, --simulate Simulate data extraction; do not download
|
||||||
anything
|
anything
|
||||||
-E, --extractor-info Print extractor defaults and settings
|
-E, --extractor-info Print extractor defaults and settings
|
||||||
@ -54,6 +56,7 @@
|
|||||||
extractors but cannot be handled, to FILE
|
extractors but cannot be handled, to FILE
|
||||||
--write-pages Write downloaded intermediary pages to files in
|
--write-pages Write downloaded intermediary pages to files in
|
||||||
the current directory to debug problems
|
the current directory to debug problems
|
||||||
|
--print-traffic Display sent and read HTTP traffic
|
||||||
--no-colors Do not emit ANSI color codes in output
|
--no-colors Do not emit ANSI color codes in output
|
||||||
|
|
||||||
## Networking Options:
|
## Networking Options:
|
||||||
|
@ -249,6 +249,9 @@ def main():
|
|||||||
if config.get(("output",), "fallback", True):
|
if config.get(("output",), "fallback", True):
|
||||||
jobtype.handle_url = \
|
jobtype.handle_url = \
|
||||||
staticmethod(jobtype.handle_url_fallback)
|
staticmethod(jobtype.handle_url_fallback)
|
||||||
|
elif args.dump_json:
|
||||||
|
jobtype = job.DataJob
|
||||||
|
jobtype.resolve = args.dump_json - 1
|
||||||
else:
|
else:
|
||||||
jobtype = args.jobtype or job.DownloadJob
|
jobtype = args.jobtype or job.DownloadJob
|
||||||
|
|
||||||
|
@ -856,6 +856,7 @@ class InfoJob(Job):
|
|||||||
|
|
||||||
class DataJob(Job):
|
class DataJob(Job):
|
||||||
"""Collect extractor results and dump them"""
|
"""Collect extractor results and dump them"""
|
||||||
|
resolve = False
|
||||||
|
|
||||||
def __init__(self, url, parent=None, file=sys.stdout, ensure_ascii=True,
|
def __init__(self, url, parent=None, file=sys.stdout, ensure_ascii=True,
|
||||||
resolve=False):
|
resolve=False):
|
||||||
@ -863,12 +864,12 @@ class DataJob(Job):
|
|||||||
self.file = file
|
self.file = file
|
||||||
self.data = []
|
self.data = []
|
||||||
self.ascii = config.get(("output",), "ascii", ensure_ascii)
|
self.ascii = config.get(("output",), "ascii", ensure_ascii)
|
||||||
self.resolve = 128 if resolve is True else resolve
|
self.resolve = 128 if resolve is True else (resolve or self.resolve)
|
||||||
|
|
||||||
private = config.get(("output",), "private")
|
private = config.get(("output",), "private")
|
||||||
self.filter = dict.copy if private else util.filter_dict
|
self.filter = dict.copy if private else util.filter_dict
|
||||||
|
|
||||||
if resolve:
|
if self.resolve > 0:
|
||||||
self.handle_queue = self.handle_queue_resolve
|
self.handle_queue = self.handle_queue_resolve
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
|
@ -293,9 +293,14 @@ def build_parser():
|
|||||||
)
|
)
|
||||||
output.add_argument(
|
output.add_argument(
|
||||||
"-j", "--dump-json",
|
"-j", "--dump-json",
|
||||||
dest="jobtype", action="store_const", const=job.DataJob,
|
dest="dump_json", action="count",
|
||||||
help="Print JSON information",
|
help="Print JSON information",
|
||||||
)
|
)
|
||||||
|
output.add_argument(
|
||||||
|
"-J", "--resolve-json",
|
||||||
|
dest="dump_json", action="store_const", const=128,
|
||||||
|
help="Print JSON information; resolve intermediary URLs",
|
||||||
|
)
|
||||||
output.add_argument(
|
output.add_argument(
|
||||||
"-s", "--simulate",
|
"-s", "--simulate",
|
||||||
dest="jobtype", action="store_const", const=job.SimulationJob,
|
dest="jobtype", action="store_const", const=job.SimulationJob,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user