github/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-08-22 06:14:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 660dfae585 into 0c24eed73a

Browse source
This commit is contained in:
GitHub Merge Button 2012-05-15 12:45:36 -07:00
commit 4e5b72dffe
1 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

44
youtube-dl
View file

@ -850,27 +850,26 @@ class FileDownloader(object):
self.trouble(u'ERROR: Cannot write metadata to JSON file ' + infofn)
return
if not self.params.get('skip_download', False):
if self.params.get('nooverwrites', False) and os.path.exists(_encodeFilename(filename)):
success = True
else:
try:
success = self._do_download(filename, info_dict)
except (OSError, IOError), err:
raise UnavailableVideoError
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
self.trouble(u'ERROR: unable to download video data: %s' % str(err))
return
except (ContentTooShortError, ), err:
self.trouble(u'ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
return
if success:
try:
self.post_process(filename, info_dict)
except (PostProcessingError), err:
self.trouble(u'ERROR: postprocessing: %s' % str(err))
return
if self.params.get('nooverwrites', False) and os.path.exists(_encodeFilename(filename)):
success = True
else:
try:
success = self._do_download(filename, info_dict)
except (OSError, IOError), err:
raise UnavailableVideoError
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
self.trouble(u'ERROR: unable to download video data: %s' % str(err))
return
except (ContentTooShortError, ), err:
self.trouble(u'ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
return
if success:
try:
self.post_process(filename, info_dict)
except (PostProcessingError), err:
self.trouble(u'ERROR: postprocessing: %s' % str(err))
return
def download(self, url_list):
"""Download a given list of URLs."""
@ -1039,6 +1038,9 @@ class FileDownloader(object):
return False
data_len = data.info().get('Content-length', None)
self.to_screen(u'[info] File size: ' + self.format_bytes(data_len) + ' bytes')
if self.params.get('skip_download', False):
return True;
if data_len is not None:
data_len = long(data_len) + resume_len
data_len_str = self.format_bytes(data_len)