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

Merge branch 'master' into for-rg3-deposit

Browse source
This commit is contained in:
Vasyl' Vavrychuk 2010-12-08 11:14:03 +02:00
commit 8716916e94
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
youtube-dl
View file

@ -639,6 +639,7 @@ class FileDownloader(object):
# Apply rate limit # Apply rate limit
self.slow_down(start, byte_counter) self.slow_down(start, byte_counter)
stream.close()
self.report_finish() self.report_finish()
if data_len is not None and str(byte_counter) != data_len: if data_len is not None and str(byte_counter) != data_len:
raise ContentTooShortError(byte_counter, long(data_len)) raise ContentTooShortError(byte_counter, long(data_len))
@ -1618,6 +1619,7 @@ class GenericIE(InfoExtractor):
self._downloader.trouble(u'ERROR: Invalid URL: %s' % url) self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)
return return
self.report_extraction(video_id)
# Start with something easy: JW Player in SWFObject # Start with something easy: JW Player in SWFObject
mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage) mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage)
if mobj is None: if mobj is None: