mirrors/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
parent 501f13fbf3 ca7a9c1bf7
commit 5f0d813d93
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/downloader/common.py
View File

@@ -284,6 +284,7 @@ class FileDownloader(object):
"""Download to a filename using the info from info_dict
Return True on success and False otherwise
"""
nooverwrites_and_exists = (
self.params.get('nooverwrites', False)
and os.path.exists(encodeFilename(filename))
@@ -305,6 +306,11 @@ class FileDownloader(object):
})
return True
sleep_interval = self.params.get('sleep_interval')
if sleep_interval:
self.to_screen('[download] Sleeping %s seconds...' % sleep_interval)
time.sleep(sleep_interval)
return self.real_download(filename, info_dict)
def real_download(self, filename, info_dict):