commit d76736fc5eb0e1f17bad036082e7361b357730e6
parent 6501a06d4641ffacfccd66d3de4ad5ab0f7db7fb
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 18 Oct 2011 13:49:21 -0700
Merge pull request #195 from rbrito/xvideos
Fixes for the xvideos IE
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/youtube-dl b/youtube-dl
@@ -3413,7 +3413,7 @@ class XVideosIE(InfoExtractor):
self.report_webpage(video_id)
- request = urllib2.Request(url)
+ request = urllib2.Request(r'http://www.xvideos.com/video' + video_id)
try:
webpage = urllib2.urlopen(request).read()
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
@@ -3426,13 +3426,13 @@ class XVideosIE(InfoExtractor):
# Extract video URL
mobj = re.search(r'flv_url=(.+?)&', webpage)
if mobj is None:
- self._downloader.trouble(u'ERROR: unable to extract video title')
+ self._downloader.trouble(u'ERROR: unable to extract video url')
return
video_url = urllib2.unquote(mobj.group(1).decode('utf-8'))
# Extract title
- mobj = re.search(r'<title>(.*?)</title>', webpage)
+ mobj = re.search(r'<title>(.*?)\s+-\s+XVID', webpage)
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract video title')
return