pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-05-12 16:54:50 +09:00
Code Issues Projects Releases Wiki Activity

Merge 86808ab7c5c520541fac187bc15a3092a09b1aa0 into 3eb8d22ddb8982ca4fb56bb7a8d6517538bf14c6

Browse Source
This commit is contained in:
Knight Hat 2025-04-01 07:59:36 +02:00 committed by GitHub
commit fe2db4c969
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/YoutubeDL.py
View File

@ -1939,6 +1939,9 @@ class YoutubeDL(object):
self.to_stdout(formatSeconds(info_dict['duration'])) self.to_stdout(formatSeconds(info_dict['duration']))
print_mandatory('format') print_mandatory('format')
if self.params.get('forcejson', False): if self.params.get('forcejson', False):
if self.params.get('indent_json', False):
self.to_stdout(json.dumps(self.sanitize_info(info_dict), indent=2))
else:
self.to_stdout(json.dumps(self.sanitize_info(info_dict))) self.to_stdout(json.dumps(self.sanitize_info(info_dict)))
@_catch_unsafe_file_extension @_catch_unsafe_file_extension

1
youtube_dl/__init__.py
View File

@ -439,6 +439,7 @@ def _real_main(argv=None):
# just for deprecation check # just for deprecation check
'autonumber': opts.autonumber if opts.autonumber is True else None, 'autonumber': opts.autonumber if opts.autonumber is True else None,
'usetitle': opts.usetitle if opts.usetitle is True else None, 'usetitle': opts.usetitle if opts.usetitle is True else None,
'indent_json': opts.pretty_json,
} }
with YoutubeDL(ydl_opts) as ydl: with YoutubeDL(ydl_opts) as ydl:

5
youtube_dl/options.py
View File

@ -679,6 +679,11 @@ def parseOpts(overrideArguments=None):
'--no-call-home', '--no-call-home',
dest='call_home', action='store_false', default=False, dest='call_home', action='store_false', default=False,
help='Do NOT contact the youtube-dl server for debugging') help='Do NOT contact the youtube-dl server for debugging')
verbosity.add_option(
'--pretty-json',
dest='pretty_json', action='store_true', default=False,
help='Print json with indentation. Only when --dump-json is provided'
)
filesystem = optparse.OptionGroup(parser, 'Filesystem Options') filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
filesystem.add_option( filesystem.add_option(