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):
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 = {}
auth_cookie = self._get_cookies('https://curiositystream.com').get('auth_token')
if auth_cookie:
self.write_debug('Obtained auth_token cookie')
- self._auth_token = cookie.value
+ self._auth_token = urllib.parse.unquote(auth_cookie.value)
if self._auth_token:
headers['X-Auth-Token'] = self._auth_token
result = self._download_json(
IE_NAME = 'curiositystream'
_VALID_URL = r'https?://(?:app\.)?curiositystream\.com/video/(?P<id>\d+)'
_TESTS = [{
- 'url': 'https://app.curiositystream.com/video/2',
+ 'url': 'http://app.curiositystream.com/video/2',
'info_dict': {
'id': '2',
'ext': 'mp4',
'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': 96.79,
+ 'average_rating': float,
'series_id': '2',
+ 'thumbnail': r're:https://img.curiositystream.com/.+\.jpg',
+ 'tags': [],
+ 'duration': 158,
},
'params': {
# m3u8 download
'format_id': 'http',
})
formats.append(fmt)
- self._sort_formats(formats)
title = media['title']
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,