schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'rupertbaxter2/master'

Browse source 
Conflicts:
	youtube_dl/__init__.py
	youtube_dl/downloader/common.py
This commit is contained in:
Philipp Hagemeister 2015-01-23 12:05:01 +01:00
commit 5f0d813d93
4 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/__init__.py
View file

@ -132,6 +132,11 @@ def _real_main(argv=None):
if numeric_limit is None:
parser.error('invalid rate limit specified')
opts.ratelimit = numeric_limit
if opts.sleepinterval is not None:
try:
opts.sleepinterval = abs(int(opts.sleepinterval))
except ValueError:
parser.error(u'invalid sleep interval specified')
if opts.min_filesize is not None:
numeric_limit = FileDownloader.parse_bytes(opts.min_filesize)
if numeric_limit is None:
@ -267,6 +272,7 @@ def _real_main(argv=None):
'restrictfilenames': opts.restrictfilenames,
'ignoreerrors': opts.ignoreerrors,
'ratelimit': opts.ratelimit,
'sleepinterval': opts.sleepinterval,
'nooverwrites': opts.nooverwrites,
'retries': opts.retries,
'buffersize': opts.buffersize,
@ -329,6 +335,7 @@ def _real_main(argv=None):
'fixup': opts.fixup,
'source_address': opts.source_address,
'call_home': opts.call_home,
'sleep_interval': opts.sleep_interval,
}
with YoutubeDL(ydl_opts) as ydl: