|
@@ -710,6 +710,8 @@ class FileDownloader(object):
|
|
|
print info_dict['description'].encode(preferredencoding(), 'xmlcharrefreplace')
|
|
|
if self.params.get('forcefilename', False) and filename is not None:
|
|
|
print filename.encode(preferredencoding(), 'xmlcharrefreplace')
|
|
|
+ if self.params.get('forceformat', False):
|
|
|
+ print info_dict['format'].encode(preferredencoding(), 'xmlcharrefreplace')
|
|
|
|
|
|
# Do nothing else if in simulate mode
|
|
|
if self.params.get('simulate', False):
|
|
@@ -3527,6 +3529,9 @@ def parseOpts():
|
|
|
verbosity.add_option('--get-filename',
|
|
|
action='store_true', dest='getfilename',
|
|
|
help='simulate, quiet but print output filename', default=False)
|
|
|
+ verbosity.add_option('--get-format',
|
|
|
+ action='store_true', dest='getformat',
|
|
|
+ help='simulate, quiet but print output format', default=False)
|
|
|
verbosity.add_option('--no-progress',
|
|
|
action='store_true', dest='noprogress', help='do not print progress bar', default=False)
|
|
|
verbosity.add_option('--console-title',
|
|
@@ -3705,14 +3710,15 @@ def main():
|
|
|
'usenetrc': opts.usenetrc,
|
|
|
'username': opts.username,
|
|
|
'password': opts.password,
|
|
|
- 'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename),
|
|
|
+ 'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat),
|
|
|
'forceurl': opts.geturl,
|
|
|
'forcetitle': opts.gettitle,
|
|
|
'forcethumbnail': opts.getthumbnail,
|
|
|
'forcedescription': opts.getdescription,
|
|
|
'forcefilename': opts.getfilename,
|
|
|
+ 'forceformat': opts.getformat,
|
|
|
'simulate': opts.simulate,
|
|
|
- 'skip_download': (opts.skip_download or opts.simulate or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename),
|
|
|
+ 'skip_download': (opts.skip_download or opts.simulate or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat),
|
|
|
'format': opts.format,
|
|
|
'format_limit': opts.format_limit,
|
|
|
'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
|