X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fign.py;h=3555f98a591b3751c1a78f34b7f8f1371ba5b97e;hb=9e1a5b845586a0a5431fb72467142046d8571e6f;hp=ac7804ad975da07ff5352c70b14cc2d1d735c9b7;hpb=109a540e7a4c5741fa77b68b4f346f42dc1cda97;p=youtube-dl
diff --git a/youtube_dl/extractor/ign.py b/youtube_dl/extractor/ign.py
index ac7804ad9..3555f98a5 100644
--- a/youtube_dl/extractor/ign.py
+++ b/youtube_dl/extractor/ign.py
@@ -89,12 +89,17 @@ class IGNIE(InfoExtractor):
']*value="[^"]*?url=(https?://www\.ign\.com/videos/.*?)["&]',
webpage)
if multiple_urls:
- return [self.url_result(u, ie='IGN') for u in multiple_urls]
+ entries = [self.url_result(u, ie='IGN') for u in multiple_urls]
+ return {
+ '_type': 'playlist',
+ 'id': name_or_id,
+ 'entries': entries,
+ }
video_id = self._find_video_id(webpage)
result = self._get_video_info(video_id)
description = self._html_search_regex(self._DESCRIPTION_RE,
- webpage, 'video description', flags=re.DOTALL)
+ webpage, 'video description', flags=re.DOTALL)
result['description'] = description
return result
@@ -112,13 +117,13 @@ class IGNIE(InfoExtractor):
class OneUPIE(IGNIE):
- _VALID_URL = r'https?://gamevideos\.1up\.com/(?Pvideo)/id/(?P.+)'
+ _VALID_URL = r'https?://gamevideos\.1up\.com/(?Pvideo)/id/(?P.+)\.html'
IE_NAME = '1up.com'
_DESCRIPTION_RE = r'(.+?)
'
_TESTS = [{
- 'url': 'http://gamevideos.1up.com/video/id/34976',
+ 'url': 'http://gamevideos.1up.com/video/id/34976.html',
'md5': '68a54ce4ebc772e4b71e3123d413163d',
'info_dict': {
'id': '34976',