-# coding: utf-8
-from __future__ import unicode_literals
-
import re
+import urllib.parse
from .common import InfoExtractor
-from ..utils import (
- int_or_none,
- urlencode_postdata,
- compat_str,
- ExtractorError,
-)
+from ..utils import ExtractorError, int_or_none, urlencode_postdata
class CuriosityStreamBaseIE(InfoExtractor):
_NETRC_MACHINE = 'curiositystream'
_auth_token = None
- _API_BASE_URL = 'https://api.curiositystream.com/v1/'
def _handle_errors(self, result):
error = result.get('error', {}).get('message')
if isinstance(error, dict):
error = ', '.join(error.values())
raise ExtractorError(
- '%s said: %s' % (self.IE_NAME, error), expected=True)
+ f'{self.IE_NAME} said: {error}', expected=True)
def _call_api(self, path, video_id, query=None):
headers = {}
+ if not self._auth_token:
+ auth_cookie = self._get_cookies('https://curiositystream.com').get('auth_token')
+ if auth_cookie:
+ self.write_debug('Obtained auth_token cookie')
+ self._auth_token = urllib.parse.unquote(auth_cookie.value)
if self._auth_token:
headers['X-Auth-Token'] = self._auth_token
result = self._download_json(
self._handle_errors(result)
return result['data']
- def _real_initialize(self):
- email, password = self._get_login_info()
- if email is None:
- return
+ def _perform_login(self, username, password):
result = self._download_json(
- self._API_BASE_URL + 'login', None, data=urlencode_postdata({
- 'email': email,
+ 'https://api.curiositystream.com/v1/login', None,
+ note='Logging in', data=urlencode_postdata({
+ 'email': username,
'password': password,
}))
self._handle_errors(result)
- self._auth_token = result['message']['auth_token']
+ CuriosityStreamBaseIE._auth_token = result['message']['auth_token']
class CuriosityStreamIE(CuriosityStreamBaseIE):
IE_NAME = 'curiositystream'
_VALID_URL = r'https?://(?:app\.)?curiositystream\.com/video/(?P<id>\d+)'
- _TEST = {
- 'url': 'https://app.curiositystream.com/video/2',
+ _TESTS = [{
+ 'url': 'http://app.curiositystream.com/video/2',
'info_dict': {
'id': '2',
'ext': 'mp4',
'title': 'How Did You Develop The Internet?',
'description': 'Vint Cerf, Google\'s Chief Internet Evangelist, describes how he and Bob Kahn created the internet.',
+ 'channel': 'Curiosity Stream',
+ 'categories': ['Technology', 'Interview'],
+ 'average_rating': float,
+ 'series_id': '2',
+ 'thumbnail': r're:https://img.curiositystream.com/.+\.jpg',
+ 'tags': [],
+ 'duration': 158,
},
'params': {
- 'format': 'bestvideo',
# m3u8 download
'skip_download': True,
},
- }
+ }]
+
+ _API_BASE_URL = 'https://api.curiositystream.com/v1/media/'
def _real_extract(self, url):
video_id = self._match_id(url)
formats = []
for encoding_format in ('m3u8', 'mpd'):
- media = self._call_api('media/' + video_id, video_id, query={
+ media = self._call_api(video_id, video_id, query={
'encodingsNew': 'true',
'encodingsFormat': encoding_format,
})
'format_id': 'http',
})
formats.append(fmt)
- self._sort_formats(formats)
title = media['title']
'duration': int_or_none(media.get('duration')),
'tags': media.get('tags'),
'subtitles': subtitles,
+ 'channel': media.get('producer'),
+ 'categories': [media.get('primary_category'), media.get('type')],
+ 'average_rating': media.get('rating_percentage'),
+ 'series_id': str(media.get('collection_id') or '') or None,
}
-class CuriosityStreamCollectionsIE(CuriosityStreamBaseIE):
- IE_NAME = 'curiositystream:collections'
- _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/collections/(?P<id>\d+)'
- _API_BASE_URL = 'https://api.curiositystream.com/v2/collections/'
- _TESTS = [{
- 'url': 'https://curiositystream.com/collections/86',
- 'info_dict': {
- 'id': '86',
- 'title': 'Staff Picks',
- 'description': 'Wondering where to start? Here are a few of our favorite series and films... from our couch to yours.',
- },
- 'playlist_mincount': 7,
- }]
+class CuriosityStreamCollectionBaseIE(CuriosityStreamBaseIE):
def _real_extract(self, url):
collection_id = self._match_id(url)
collection = self._call_api(collection_id, collection_id)
entries = []
for media in collection.get('media', []):
- media_id = compat_str(media.get('id'))
+ media_id = str(media.get('id'))
media_type, ie = ('series', CuriosityStreamSeriesIE) if media.get('is_collection') else ('video', CuriosityStreamIE)
entries.append(self.url_result(
- 'https://curiositystream.com/%s/%s' % (media_type, media_id),
+ f'https://curiositystream.com/{media_type}/{media_id}',
ie=ie.ie_key(), video_id=media_id))
return self.playlist_result(
entries, collection_id,
collection.get('title'), collection.get('description'))
-class CuriosityStreamSeriesIE(CuriosityStreamCollectionsIE):
+class CuriosityStreamCollectionsIE(CuriosityStreamCollectionBaseIE):
+ IE_NAME = 'curiositystream:collections'
+ _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/collections/(?P<id>\d+)'
+ _API_BASE_URL = 'https://api.curiositystream.com/v2/collections/'
+ _TESTS = [{
+ 'url': 'https://curiositystream.com/collections/86',
+ 'info_dict': {
+ 'id': '86',
+ 'title': 'Staff Picks',
+ 'description': 'Wondering where to start? Here are a few of our favorite series and films... from our couch to yours.',
+ },
+ 'playlist_mincount': 7,
+ }, {
+ 'url': 'https://curiositystream.com/collections/36',
+ 'only_matching': True,
+ }]
+
+
+class CuriosityStreamSeriesIE(CuriosityStreamCollectionBaseIE):
IE_NAME = 'curiositystream:series'
- _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/series/(?P<id>\d+)'
+ _VALID_URL = r'https?://(?:app\.)?curiositystream\.com/(?:series|collection)/(?P<id>\d+)'
_API_BASE_URL = 'https://api.curiositystream.com/v2/series/'
_TESTS = [{
- 'url': 'https://app.curiositystream.com/series/2',
+ 'url': 'https://curiositystream.com/series/2',
'info_dict': {
'id': '2',
'title': 'Curious Minds: The Internet',
'description': 'How is the internet shaping our lives in the 21st Century?',
},
'playlist_mincount': 16,
+ }, {
+ 'url': 'https://curiositystream.com/collection/2',
+ 'only_matching': True,
}]