aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-09-23 13:28:05 +0100
committerremitamine <remitamine@gmail.com>2015-09-23 13:28:05 +0100
commitb306c439d7f2997ebf2a88385c73fe2d92227b76 (patch)
tree0181d1a3a1b6a8dc8f8ef41c36fae375156d60dc /youtube_dl/extractor
parentf1028194636e7acafb29fb38244cc7b1347d9313 (diff)
[cnet] fix extraction and extract more formats
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/cnet.py54
1 files changed, 23 insertions, 31 deletions
diff --git a/youtube_dl/extractor/cnet.py b/youtube_dl/extractor/cnet.py
index 5dd69bff7..2fac0d79d 100644
--- a/youtube_dl/extractor/cnet.py
+++ b/youtube_dl/extractor/cnet.py
@@ -4,9 +4,7 @@ from __future__ import unicode_literals
import json
from .common import InfoExtractor
-from ..utils import (
- ExtractorError,
-)
+from .theplatform import ThePlatformIE
class CNETIE(InfoExtractor):
@@ -15,29 +13,22 @@ class CNETIE(InfoExtractor):
'url': 'http://www.cnet.com/videos/hands-on-with-microsofts-windows-8-1-update/',
'info_dict': {
'id': '56f4ea68-bd21-4852-b08c-4de5b8354c60',
- 'ext': 'flv',
+ 'ext': 'mp4',
'title': 'Hands-on with Microsoft Windows 8.1 Update',
'description': 'The new update to the Windows 8 OS brings improved performance for mouse and keyboard users.',
- 'thumbnail': 're:^http://.*/flmswindows8.jpg$',
'uploader_id': '6085384d-619e-11e3-b231-14feb5ca9861',
'uploader': 'Sarah Mitroff',
},
- 'params': {
- 'skip_download': 'requires rtmpdump',
- }
}, {
'url': 'http://www.cnet.com/videos/whiny-pothole-tweets-at-local-government-when-hit-by-cars-tomorrow-daily-187/',
'info_dict': {
'id': '56527b93-d25d-44e3-b738-f989ce2e49ba',
- 'ext': 'flv',
+ 'ext': 'mp4',
'description': 'Khail and Ashley wonder what other civic woes can be solved by self-tweeting objects, investigate a new kind of VR camera and watch an origami robot self-assemble, walk, climb, dig and dissolve. #TDPothole',
'uploader_id': 'b163284d-6b73-44fc-b3e6-3da66c392d40',
'uploader': 'Ashley Esqueda',
'title': 'Whiny potholes tweet at local government when hit by cars (Tomorrow Daily 187)',
},
- 'params': {
- 'skip_download': True, # requires rtmpdump
- },
}]
def _real_extract(self, url):
@@ -45,26 +36,13 @@ class CNETIE(InfoExtractor):
webpage = self._download_webpage(url, display_id)
data_json = self._html_search_regex(
- r"<div class=\"cnetVideoPlayer\"\s+.*?data-cnet-video-options='([^']+)'",
+ r"<div class=\"videoPlayer\"\s+.*?data-cnet-video-uvp-options='([^']+)'",
webpage, 'data json')
data = json.loads(data_json)
- vdata = data['video']
- if not vdata:
- vdata = data['videos'][0]
- if not vdata:
- raise ExtractorError('Cannot find video data')
-
- mpx_account = data['config']['players']['default']['mpx_account']
- vid = vdata['files'].get('rtmp', vdata['files']['hds'])
- tp_link = 'http://link.theplatform.com/s/%s/%s' % (mpx_account, vid)
+ vdata = data['videos'][0]
video_id = vdata['id']
- title = vdata.get('headline')
- if title is None:
- title = vdata.get('title')
- if title is None:
- raise ExtractorError('Cannot find title!')
- thumbnail = vdata.get('image', {}).get('path')
+ title = vdata['title']
author = vdata.get('author')
if author:
uploader = '%s %s' % (author['firstName'], author['lastName'])
@@ -73,13 +51,27 @@ class CNETIE(InfoExtractor):
uploader = None
uploader_id = None
+ mpx_account = data['config']['uvpConfig']['default']['mpx_account']
+ tp = ThePlatformIE(self._downloader)
+ formats = []
+ subtitles = {}
+ description = vdata.get('description')
+
+ for vid in vdata['files'].values():
+ result = tp.extract(('http://link.theplatform.com/s/%s/%s' % (mpx_account, vid)))
+ formats.extend(result['formats'])
+ subtitles = self._merge_subtitles(subtitles, result['subtitles'])
+ description = description or result.get('description')
+
+ self._sort_formats(formats)
+
return {
- '_type': 'url_transparent',
- 'url': tp_link,
'id': video_id,
'display_id': display_id,
'title': title,
+ 'description': description,
'uploader': uploader,
'uploader_id': uploader_id,
- 'thumbnail': thumbnail,
+ 'subtitles': subtitles,
+ 'formats': formats,
}