Test Travis CI

This commit is contained in:
Le bang 2013-11-11 19:50:55 +07:00
parent 070a9c1841
commit f9cb1f9ab5
2 changed files with 1 additions and 9 deletions

View File

@ -544,12 +544,7 @@ class FileDownloader(object):
# Download and write # Download and write
before = time.time() before = time.time()
data_block = data.read(block_size) data_block = data.read(block_size)
# Dynamic output video binary to stdout
if self.params.get('dynamic', False) and self.params.get('quiet', False):
try:
sys.stdout.write(data_block)
except ImportError: # Python 3
sys.stdout.buffer.write(data_block)
after = time.time() after = time.time()
if len(data_block) == 0: if len(data_block) == 0:
break break

View File

@ -280,8 +280,6 @@ def parseOpts(overrideArguments=None):
help='do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE.', default=False) help='do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE.', default=False)
downloader.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP) downloader.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP)
verbosity.add_option('-d', '--dynamic',
action='store_true', dest='dynamic', help='Dynamic ouput video binary to stdout', default=False)
verbosity.add_option('-q', '--quiet', verbosity.add_option('-q', '--quiet',
action='store_true', dest='quiet', help='activates quiet mode', default=False) action='store_true', dest='quiet', help='activates quiet mode', default=False)
verbosity.add_option('-s', '--simulate', verbosity.add_option('-s', '--simulate',
@ -609,7 +607,6 @@ def _real_main(argv=None):
'username': opts.username, 'username': opts.username,
'password': opts.password, 'password': opts.password,
'videopassword': opts.videopassword, 'videopassword': opts.videopassword,
'dynamic': opts.dynamic,
'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat), 'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat),
'forceurl': opts.geturl, 'forceurl': opts.geturl,
'forcetitle': opts.gettitle, 'forcetitle': opts.gettitle,