projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rrooij-gamekings_fix'
[youtube-dl]
/
youtube_dl
/
extractor
/
ign.py
diff --git
a/youtube_dl/extractor/ign.py
b/youtube_dl/extractor/ign.py
index fb275373873c90b274f8a36ff523f36c646fb6a9..c45c68c1d6ff523ddcbb5144e260bc931fb09873 100644
(file)
--- a/
youtube_dl/extractor/ign.py
+++ b/
youtube_dl/extractor/ign.py
@@
-32,6
+32,7
@@
class IGNIE(InfoExtractor):
'description': 'md5:c8946d4260a4d43a00d5ae8ed998870c',
'timestamp': 1370440800,
'upload_date': '20130605',
'description': 'md5:c8946d4260a4d43a00d5ae8ed998870c',
'timestamp': 1370440800,
'upload_date': '20130605',
+ 'uploader_id': 'cberidon@ign.com',
}
},
{
}
},
{
@@
-48,6
+49,7
@@
class IGNIE(InfoExtractor):
'description': 'Rockstar drops the mic on this generation of games. Watch our review of the masterly Grand Theft Auto V.',
'timestamp': 1379339880,
'upload_date': '20130916',
'description': 'Rockstar drops the mic on this generation of games. Watch our review of the masterly Grand Theft Auto V.',
'timestamp': 1379339880,
'upload_date': '20130916',
+ 'uploader_id': 'danieljkrupa@gmail.com',
},
},
{
},
},
{
@@
-58,6
+60,7
@@
class IGNIE(InfoExtractor):
'description': 'The twisted beauty of GTA 5 in stunning slow motion.',
'timestamp': 1386878820,
'upload_date': '20131212',
'description': 'The twisted beauty of GTA 5 in stunning slow motion.',
'timestamp': 1386878820,
'upload_date': '20131212',
+ 'uploader_id': 'togilvie@ign.com',
},
},
],
},
},
],
@@
-75,6
+78,7
@@
class IGNIE(InfoExtractor):
'description': 'Brian and Jared explore Michel Ancel\'s captivating new preview.',
'timestamp': 1408047180,
'upload_date': '20140814',
'description': 'Brian and Jared explore Michel Ancel\'s captivating new preview.',
'timestamp': 1408047180,
'upload_date': '20140814',
+ 'uploader_id': 'jamesduggan1990@gmail.com',
},
},
{
},
},
{
@@
-104,7
+108,7
@@
class IGNIE(InfoExtractor):
webpage = self._download_webpage(url, name_or_id)
if page_type != 'video':
multiple_urls = re.findall(
webpage = self._download_webpage(url, name_or_id)
if page_type != 'video':
multiple_urls = re.findall(
- '<param name="flashvars"[^>]*value="[^"]*?url=(https?://www\.ign\.com/videos/.*?)["&]',
+
r
'<param name="flashvars"[^>]*value="[^"]*?url=(https?://www\.ign\.com/videos/.*?)["&]',
webpage)
if multiple_urls:
entries = [self.url_result(u, ie='IGN') for u in multiple_urls]
webpage)
if multiple_urls:
entries = [self.url_result(u, ie='IGN') for u in multiple_urls]
@@
-116,19
+120,24
@@
class IGNIE(InfoExtractor):
video_id = self._find_video_id(webpage)
if not video_id:
video_id = self._find_video_id(webpage)
if not video_id:
- return self.url_result(self._search_regex(self._EMBED_RE, webpage, 'embed url'))
+ return self.url_result(self._search_regex(
+ self._EMBED_RE, webpage, 'embed url'))
return self._get_video_info(video_id)
def _get_video_info(self, video_id):
return self._get_video_info(video_id)
def _get_video_info(self, video_id):
- api_data = self._download_json(self._API_URL_TEMPLATE % video_id, video_id)
+ api_data = self._download_json(
+ self._API_URL_TEMPLATE % video_id, video_id)
formats = []
m3u8_url = api_data['refs'].get('m3uUrl')
if m3u8_url:
formats = []
m3u8_url = api_data['refs'].get('m3uUrl')
if m3u8_url:
- formats.extend(self._extract_m3u8_formats(m3u8_url, video_id))
+ formats.extend(self._extract_m3u8_formats(
+ m3u8_url, video_id, 'mp4', 'm3u8_native',
+ m3u8_id='hls', fatal=False))
f4m_url = api_data['refs'].get('f4mUrl')
if f4m_url:
f4m_url = api_data['refs'].get('f4mUrl')
if f4m_url:
- formats.extend(self._extract_f4m_formats(f4m_url, video_id))
+ formats.extend(self._extract_f4m_formats(
+ f4m_url, video_id, f4m_id='hds', fatal=False))
for asset in api_data['assets']:
formats.append({
'url': asset['url'],
for asset in api_data['assets']:
formats.append({
'url': asset['url'],
@@
-139,9
+148,9
@@
class IGNIE(InfoExtractor):
})
self._sort_formats(formats)
})
self._sort_formats(formats)
- thumbnails = [
]
- for thumbnail in api_data['thumbnails']:
- thumbnails.append({'url': thumbnail['url']})
+ thumbnails = [
{
+ 'url': thumbnail['url']
+ } for thumbnail in api_data.get('thumbnails', [])]
metadata = api_data['metadata']
metadata = api_data['metadata']
@@
-152,6
+161,7
@@
class IGNIE(InfoExtractor):
'timestamp': parse_iso8601(metadata.get('publishDate')),
'duration': int_or_none(metadata.get('duration')),
'display_id': metadata.get('slug') or video_id,
'timestamp': parse_iso8601(metadata.get('publishDate')),
'duration': int_or_none(metadata.get('duration')),
'display_id': metadata.get('slug') or video_id,
+ 'uploader_id': metadata.get('creator'),
'thumbnails': thumbnails,
'formats': formats,
}
'thumbnails': thumbnails,
'formats': formats,
}
@@
-171,6
+181,7
@@
class OneUPIE(IGNIE):
'description': 'md5:bf0516c5ee32a3217aa703e9b1bc7826',
'timestamp': 1313099220,
'upload_date': '20110811',
'description': 'md5:bf0516c5ee32a3217aa703e9b1bc7826',
'timestamp': 1313099220,
'upload_date': '20110811',
+ 'uploader_id': 'IGN',
}
}]
}
}]
@@
-197,8
+208,9
@@
class PCMagIE(IGNIE):
'description': 'md5:a7071ae64d2f68cc821c729d4ded6bb3',
'timestamp': 1420571160,
'upload_date': '20150106',
'description': 'md5:a7071ae64d2f68cc821c729d4ded6bb3',
'timestamp': 1420571160,
'upload_date': '20150106',
+ 'uploader_id': 'cozzipix@gmail.com',
}
}
- },{
+ },
{
'url': 'http://www.pcmag.com/article2/0,2817,2470156,00.asp',
'md5': '94130c1ca07ba0adb6088350681f16c1',
'info_dict': {
'url': 'http://www.pcmag.com/article2/0,2817,2470156,00.asp',
'md5': '94130c1ca07ba0adb6088350681f16c1',
'info_dict': {
@@
-208,5
+220,6
@@
class PCMagIE(IGNIE):
'description': 'md5:53433c45df96d2ea5d0fda18be2ca908',
'timestamp': 1412953920,
'upload_date': '20141010',
'description': 'md5:53433c45df96d2ea5d0fda18be2ca908',
'timestamp': 1412953920,
'upload_date': '20141010',
+ 'uploader_id': 'chris_snyder@pcmag.com',
}
}]
}
}]