mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-22 16:57:40 +00:00
[ign] Support more urls and detect multiple videos in articles (fixes #1543)
This commit is contained in:
parent
be8fe32c92
commit
ee6adb166c
1 changed files with 44 additions and 10 deletions
|
@ -13,7 +13,7 @@ class IGNIE(InfoExtractor):
|
||||||
Some videos of it.ign.com are also supported
|
Some videos of it.ign.com are also supported
|
||||||
"""
|
"""
|
||||||
|
|
||||||
_VALID_URL = r'https?://.+?\.ign\.com/(?P<type>videos|show_videos|articles)(/.+)?/(?P<name_or_id>.+)'
|
_VALID_URL = r'https?://.+?\.ign\.com/(?P<type>videos|show_videos|articles|(?:[^/]*/feature))(/.+)?/(?P<name_or_id>.+)'
|
||||||
IE_NAME = u'ign.com'
|
IE_NAME = u'ign.com'
|
||||||
|
|
||||||
_CONFIG_URL_TEMPLATE = 'http://www.ign.com/videos/configs/id/%s.config'
|
_CONFIG_URL_TEMPLATE = 'http://www.ign.com/videos/configs/id/%s.config'
|
||||||
|
@ -21,7 +21,8 @@ class IGNIE(InfoExtractor):
|
||||||
r'id="my_show_video">.*?<p>(.*?)</p>',
|
r'id="my_show_video">.*?<p>(.*?)</p>',
|
||||||
]
|
]
|
||||||
|
|
||||||
_TEST = {
|
_TESTS = [
|
||||||
|
{
|
||||||
u'url': u'http://www.ign.com/videos/2013/06/05/the-last-of-us-review',
|
u'url': u'http://www.ign.com/videos/2013/06/05/the-last-of-us-review',
|
||||||
u'file': u'8f862beef863986b2785559b9e1aa599.mp4',
|
u'file': u'8f862beef863986b2785559b9e1aa599.mp4',
|
||||||
u'md5': u'eac8bdc1890980122c3b66f14bdd02e9',
|
u'md5': u'eac8bdc1890980122c3b66f14bdd02e9',
|
||||||
|
@ -29,7 +30,30 @@ class IGNIE(InfoExtractor):
|
||||||
u'title': u'The Last of Us Review',
|
u'title': u'The Last of Us Review',
|
||||||
u'description': u'md5:c8946d4260a4d43a00d5ae8ed998870c',
|
u'description': u'md5:c8946d4260a4d43a00d5ae8ed998870c',
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
u'url': u'http://me.ign.com/en/feature/15775/100-little-things-in-gta-5-that-will-blow-your-mind',
|
||||||
|
u'playlist': [
|
||||||
|
{
|
||||||
|
u'file': u'5ebbd138523268b93c9141af17bec937.mp4',
|
||||||
|
u'info_dict': {
|
||||||
|
u'title': u'GTA 5 Video Review',
|
||||||
|
u'description': u'Rockstar drops the mic on this generation of games. Watch our review of the masterly Grand Theft Auto V.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
u'file': u'638672ee848ae4ff108df2a296418ee2.mp4',
|
||||||
|
u'info_dict': {
|
||||||
|
u'title': u'GTA 5\'s Twisted Beauty in Super Slow Motion',
|
||||||
|
u'description': u'The twisted beauty of GTA 5 in stunning slow motion.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
u'params': {
|
||||||
|
u'skip_download': True,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
def _find_video_id(self, webpage):
|
def _find_video_id(self, webpage):
|
||||||
res_id = [r'data-video-id="(.+?)"',
|
res_id = [r'data-video-id="(.+?)"',
|
||||||
|
@ -46,6 +70,13 @@ class IGNIE(InfoExtractor):
|
||||||
if page_type == 'articles':
|
if page_type == 'articles':
|
||||||
video_url = self._search_regex(r'var videoUrl = "(.+?)"', webpage, u'video url')
|
video_url = self._search_regex(r'var videoUrl = "(.+?)"', webpage, u'video url')
|
||||||
return self.url_result(video_url, ie='IGN')
|
return self.url_result(video_url, ie='IGN')
|
||||||
|
elif page_type != 'video':
|
||||||
|
multiple_urls = re.findall(
|
||||||
|
'<param name="flashvars" value="[^"]*?url=(https?://www\.ign\.com/videos/.*?)["&]',
|
||||||
|
webpage)
|
||||||
|
if multiple_urls:
|
||||||
|
return [self.url_result(u, ie='IGN') for u in multiple_urls]
|
||||||
|
|
||||||
video_id = self._find_video_id(webpage)
|
video_id = self._find_video_id(webpage)
|
||||||
result = self._get_video_info(video_id)
|
result = self._get_video_info(video_id)
|
||||||
description = self._html_search_regex(self._DESCRIPTION_RE,
|
description = self._html_search_regex(self._DESCRIPTION_RE,
|
||||||
|
@ -87,6 +118,9 @@ class OneUPIE(IGNIE):
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Override IGN tests
|
||||||
|
_TESTS = []
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
id = mobj.group('name_or_id')
|
id = mobj.group('name_or_id')
|
||||||
|
|
Loading…
Reference in a new issue