diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2011-10-18 13:49:21 -0700 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2011-10-18 13:49:21 -0700 |
| commit | d76736fc5eb0e1f17bad036082e7361b357730e6 (patch) | |
| tree | ee38c3eadb77065c42fc51b9c4c6be42a3d18895 | |
| parent | 6501a06d4641ffacfccd66d3de4ad5ab0f7db7fb (diff) | |
| parent | 0f9b77223e92a25eb1f4a626efcd7ff76beb9841 (diff) | |
Merge pull request #195 from rbrito/xvideos
Fixes for the xvideos IE
| -rwxr-xr-x | youtube-dl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube-dl b/youtube-dl index 450da8ebd..6770678d2 100755 --- 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 |