|
@ -711,7 +711,7 @@ class FileDownloader(object): |
|
|
else: |
|
|
else: |
|
|
# Examine the reported length |
|
|
# Examine the reported length |
|
|
if (content_length is not None and |
|
|
if (content_length is not None and |
|
|
(resume_len - 100 < long(content_length) < resume_len + 100)): |
|
|
|
|
|
|
|
|
(resume_len - 100 < long(content_length) < resume_len + 100)): |
|
|
# The file had already been fully downloaded. |
|
|
# The file had already been fully downloaded. |
|
|
# Explanation to the above condition: in issue #175 it was revealed that |
|
|
# Explanation to the above condition: in issue #175 it was revealed that |
|
|
# YouTube sometimes adds or removes a few bytes from the end of the file, |
|
|
# YouTube sometimes adds or removes a few bytes from the end of the file, |
|
@ -1690,8 +1690,8 @@ class YahooIE(InfoExtractor): |
|
|
yv_lg = 'R0xx6idZnW2zlrKP8xxAIR' # not sure what this represents |
|
|
yv_lg = 'R0xx6idZnW2zlrKP8xxAIR' # not sure what this represents |
|
|
yv_bitrate = '700' # according to Wikipedia this is hard-coded |
|
|
yv_bitrate = '700' # according to Wikipedia this is hard-coded |
|
|
request = urllib2.Request('http://cosmos.bcst.yahoo.com/up/yep/process/getPlaylistFOP.php?node_id=' + video_id + |
|
|
request = urllib2.Request('http://cosmos.bcst.yahoo.com/up/yep/process/getPlaylistFOP.php?node_id=' + video_id + |
|
|
'&tech=flash&mode=playlist&lg=' + yv_lg + '&bitrate=' + yv_bitrate + '&vidH=' + yv_video_height + |
|
|
|
|
|
'&vidW=' + yv_video_width + '&swf=as3&rd=video.yahoo.com&tk=null&adsupported=v1,v2,&eventid=1301797') |
|
|
|
|
|
|
|
|
'&tech=flash&mode=playlist&lg=' + yv_lg + '&bitrate=' + yv_bitrate + '&vidH=' + yv_video_height + |
|
|
|
|
|
'&vidW=' + yv_video_width + '&swf=as3&rd=video.yahoo.com&tk=null&adsupported=v1,v2,&eventid=1301797') |
|
|
try: |
|
|
try: |
|
|
self.report_download_webpage(video_id) |
|
|
self.report_download_webpage(video_id) |
|
|
webpage = urllib2.urlopen(request).read() |
|
|
webpage = urllib2.urlopen(request).read() |
|
@ -2260,9 +2260,9 @@ class YoutubeUserIE(InfoExtractor): |
|
|
video_ids = video_ids[playliststart:] |
|
|
video_ids = video_ids[playliststart:] |
|
|
else: |
|
|
else: |
|
|
video_ids = video_ids[playliststart:playlistend] |
|
|
video_ids = video_ids[playliststart:playlistend] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self._downloader.to_screen("[youtube] user %s: Collected %d video ids (downloading %d of them)" % |
|
|
self._downloader.to_screen("[youtube] user %s: Collected %d video ids (downloading %d of them)" % |
|
|
(username, all_ids_count, len(video_ids))) |
|
|
|
|
|
|
|
|
(username, all_ids_count, len(video_ids))) |
|
|
|
|
|
|
|
|
for video_id in video_ids: |
|
|
for video_id in video_ids: |
|
|
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % video_id) |
|
|
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % video_id) |
|
@ -2515,7 +2515,7 @@ class FacebookIE(InfoExtractor): |
|
|
# description |
|
|
# description |
|
|
video_description = 'No description available.' |
|
|
video_description = 'No description available.' |
|
|
if (self._downloader.params.get('forcedescription', False) and |
|
|
if (self._downloader.params.get('forcedescription', False) and |
|
|
'description' in video_info): |
|
|
|
|
|
|
|
|
'description' in video_info): |
|
|
video_description = video_info['description'] |
|
|
video_description = video_info['description'] |
|
|
|
|
|
|
|
|
url_map = video_info['video_urls'] |
|
|
url_map = video_info['video_urls'] |
|
|