Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix _do_download signature

pull/169/head
Philipp Hagemeister 2011-09-15 19:22:18 +02:00
parent 18bb3d1e35
commit 366cbfb04a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube-dl
View File

@ -775,8 +775,7 @@ class FileDownloader(object):
if not self.params.get('skip_download', False): if not self.params.get('skip_download', False):
try: try:
success,add_data = self._do_download(filename, info_dict['url'].encode('utf-8'), info_dict.get('player_url', None)) success = self._do_download(filename, info_dict)
info_dict.update(add_data)
except (OSError, IOError), err: except (OSError, IOError), err:
raise UnavailableVideoError raise UnavailableVideoError
except (urllib2.URLError, httplib.HTTPException, socket.error), err: except (urllib2.URLError, httplib.HTTPException, socket.error), err:
@ -865,7 +864,10 @@ class FileDownloader(object):
self.trouble(u'\nERROR: rtmpdump exited with code %d' % retval) self.trouble(u'\nERROR: rtmpdump exited with code %d' % retval)
return False return False
def _do_download(self, filename, url, player_url): def _do_download(self, filename, info_dict):
url = info_dict['url']
player_url = info_dict.get('player_url', None)
# Check file already present # Check file already present
if self.params.get('continuedl', False) and os.path.isfile(filename) and not self.params.get('nopart', False): if self.params.get('continuedl', False) and os.path.isfile(filename) and not self.params.get('nopart', False):
self.report_file_already_downloaded(filename) self.report_file_already_downloaded(filename)
@ -998,11 +1000,10 @@ class FileDownloader(object):
self.try_rename(tmpfilename, filename) self.try_rename(tmpfilename, filename)
# Update file modification time # Update file modification time
filetime = None
if self.params.get('updatetime', True): if self.params.get('updatetime', True):
filetime = self.try_utime(filename, data.info().get('last-modified', None)) info_dict['filetime'] = self.try_utime(filename, data.info().get('last-modified', None))
return True, {'filetime': filetime} return True
class InfoExtractor(object): class InfoExtractor(object):