aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/blinkx.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-07 09:45:40 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-07 09:45:40 +0100
commitf577e0ce15adfc6c235b09a9b7a212bd5c6febda (patch)
tree441437a2b4d6310c66e7a4db3bce56e2f63ba5aa /youtube_dl/extractor/blinkx.py
parentbd1b906527cf9d37150091a7b1f1cbddd0a11241 (diff)
downloadyoutube-dl-f577e0ce15adfc6c235b09a9b7a212bd5c6febda.tar.xz
switch more to unicode_literals
Diffstat (limited to 'youtube_dl/extractor/blinkx.py')
-rw-r--r--youtube_dl/extractor/blinkx.py34
1 files changed, 18 insertions, 16 deletions
diff --git a/youtube_dl/extractor/blinkx.py b/youtube_dl/extractor/blinkx.py
index 0229840a3..7daeb90ad 100644
--- a/youtube_dl/extractor/blinkx.py
+++ b/youtube_dl/extractor/blinkx.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
import datetime
import json
import re
@@ -10,19 +12,19 @@ from ..utils import (
class BlinkxIE(InfoExtractor):
_VALID_URL = r'^(?:https?://(?:www\.)blinkx\.com/#?ce/|blinkx:)(?P<id>[^?]+)'
- _IE_NAME = u'blinkx'
+ _IE_NAME = 'blinkx'
_TEST = {
- u'url': u'http://www.blinkx.com/ce/8aQUy7GVFYgFzpKhT0oqsilwOGFRVXk3R1ZGWWdGenBLaFQwb3FzaWx3OGFRVXk3R1ZGWWdGenB',
- u'file': u'8aQUy7GV.mp4',
- u'md5': u'2e9a07364af40163a908edbf10bb2492',
- u'info_dict': {
- u"title": u"Police Car Rolls Away",
- u"uploader": u"stupidvideos.com",
- u"upload_date": u"20131215",
- u"description": u"A police car gently rolls away from a fight. Maybe it felt weird being around a confrontation and just had to get out of there!",
- u"duration": 14.886,
- u"thumbnails": [{
+ 'url': 'http://www.blinkx.com/ce/8aQUy7GVFYgFzpKhT0oqsilwOGFRVXk3R1ZGWWdGenBLaFQwb3FzaWx3OGFRVXk3R1ZGWWdGenB',
+ 'file': '8aQUy7GV.mp4',
+ 'md5': '2e9a07364af40163a908edbf10bb2492',
+ 'info_dict': {
+ "title": "Police Car Rolls Away",
+ "uploader": "stupidvideos.com",
+ "upload_date": "20131215",
+ "description": "A police car gently rolls away from a fight. Maybe it felt weird being around a confrontation and just had to get out of there!",
+ "duration": 14.886,
+ "thumbnails": [{
"width": 100,
"height": 76,
"url": "http://cdn.blinkx.com/stream/b/41/StupidVideos/20131215/1873969261/1873969261_tn_0.jpg",
@@ -30,17 +32,17 @@ class BlinkxIE(InfoExtractor):
},
}
- def _real_extract(self, url):
- m = re.match(self._VALID_URL, url)
+ def _real_extract(self, rl):
+ m = re.match(self._VALID_URL, rl)
video_id = m.group('id')
display_id = video_id[:8]
api_url = (u'https://apib4.blinkx.com/api.php?action=play_video&' +
- u'video=%s' % video_id)
+ 'video=%s' % video_id)
data_json = self._download_webpage(api_url, display_id)
data = json.loads(data_json)['api']['results'][0]
dt = datetime.datetime.fromtimestamp(data['pubdate_epoch'])
- upload_date = dt.strftime('%Y%m%d')
+ pload_date = dt.strftime('%Y%m%d')
duration = None
thumbnails = []
@@ -86,7 +88,7 @@ class BlinkxIE(InfoExtractor):
'title': data['title'],
'formats': formats,
'uploader': data['channel_name'],
- 'upload_date': upload_date,
+ 'upload_date': pload_date,
'description': data.get('description'),
'thumbnails': thumbnails,
'duration': duration,