projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b46285
)
[xvideos] Add support for embed URLs and improve extraction (closes #14409)
author
Sergey M․
<dstftw@gmail.com>
Wed, 4 Oct 2017 17:27:24 +0000
(
00:27
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 4 Oct 2017 17:27:24 +0000
(
00:27
+0700)
youtube_dl/extractor/xvideos.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/xvideos.py
b/youtube_dl/extractor/xvideos.py
index eca603028d9ac91cf98e3da6c3651444f1653730..085c8d4f35a68c74c61ca9af571d421a68783d93 100644
(file)
--- a/
youtube_dl/extractor/xvideos.py
+++ b/
youtube_dl/extractor/xvideos.py
@@
-14,8
+14,16
@@
from ..utils import (
class XVideosIE(InfoExtractor):
class XVideosIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?xvideos\.com/video(?P<id>[0-9]+)(?:.*)'
- _TEST = {
+ _VALID_URL = r'''(?x)
+ https?://
+ (?:
+ (?:www\.)?xvideos\.com/video|
+ flashservice\.xvideos\.com/embedframe/|
+ static-hw\.xvideos\.com/swf/xv-player\.swf\?.*?\bid_video=
+ )
+ (?P<id>[0-9]+)
+ '''
+ _TESTS = [{
'url': 'http://www.xvideos.com/video4588838/biker_takes_his_girl',
'md5': '14cea69fcb84db54293b1e971466c2e1',
'info_dict': {
'url': 'http://www.xvideos.com/video4588838/biker_takes_his_girl',
'md5': '14cea69fcb84db54293b1e971466c2e1',
'info_dict': {
@@
-25,21
+33,33
@@
class XVideosIE(InfoExtractor):
'duration': 108,
'age_limit': 18,
}
'duration': 108,
'age_limit': 18,
}
- }
+ }, {
+ 'url': 'https://flashservice.xvideos.com/embedframe/4588838',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://static-hw.xvideos.com/swf/xv-player.swf?id_video=4588838',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)
- webpage = self._download_webpage(url, video_id)
+
+ webpage = self._download_webpage(
+ 'http://www.xvideos.com/video%s/' % video_id, video_id)
mobj = re.search(r'<h1 class="inlineError">(.+?)</h1>', webpage)
if mobj:
raise ExtractorError('%s said: %s' % (self.IE_NAME, clean_html(mobj.group(1))), expected=True)
mobj = re.search(r'<h1 class="inlineError">(.+?)</h1>', webpage)
if mobj:
raise ExtractorError('%s said: %s' % (self.IE_NAME, clean_html(mobj.group(1))), expected=True)
- video_title = self._html_search_regex(
- r'<title>(.*?)\s+-\s+XVID', webpage, 'title')
- video_thumbnail = self._search_regex(
+ title = self._html_search_regex(
+ (r'<title>(?P<title>.+?)\s+-\s+XVID',
+ r'setVideoTitle\s*\(\s*(["\'])(?P<title>(?:(?!\1).)+)\1'),
+ webpage, 'title', default=None,
+ group='title') or self._og_search_title(webpage)
+
+ thumbnail = self._search_regex(
r'url_bigthumb=(.+?)&', webpage, 'thumbnail', fatal=False)
r'url_bigthumb=(.+?)&', webpage, 'thumbnail', fatal=False)
-
video_
duration = int_or_none(self._og_search_property(
+ duration = int_or_none(self._og_search_property(
'duration', webpage, default=None)) or parse_duration(
self._search_regex(
r'<span[^>]+class=["\']duration["\'][^>]*>.*?(\d[^<]+)',
'duration', webpage, default=None)) or parse_duration(
self._search_regex(
r'<span[^>]+class=["\']duration["\'][^>]*>.*?(\d[^<]+)',
@@
-74,8
+94,8
@@
class XVideosIE(InfoExtractor):
return {
'id': video_id,
'formats': formats,
return {
'id': video_id,
'formats': formats,
- 'title':
video_
title,
- 'duration':
video_
duration,
- 'thumbnail':
video_
thumbnail,
+ 'title': title,
+ 'duration': duration,
+ 'thumbnail': thumbnail,
'age_limit': 18,
}
'age_limit': 18,
}