git://git.jankratochvil.net
/
youtube-dl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #195 from rbrito/xvideos
[youtube-dl.git]
/
youtube-dl
diff --git
a/youtube-dl
b/youtube-dl
index
450da8e
..
6770678
100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-3413,7
+3413,7
@@
class XVideosIE(InfoExtractor):
self.report_webpage(video_id)
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:
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:
# 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
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
if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract video title')
return