mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-02 09:12:40 +01:00
[curiositystream] add support for non app urls
This commit is contained in:
parent
f1ab3b7de7
commit
3b983ee471
@ -46,8 +46,24 @@ def _real_initialize(self):
|
|||||||
self._handle_errors(result)
|
self._handle_errors(result)
|
||||||
self._auth_token = result['message']['auth_token']
|
self._auth_token = result['message']['auth_token']
|
||||||
|
|
||||||
def _extract_media_info(self, media):
|
|
||||||
video_id = compat_str(media['id'])
|
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',
|
||||||
|
'md5': '262bb2f257ff301115f1973540de8983',
|
||||||
|
'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.',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
video_id = self._match_id(url)
|
||||||
|
media = self._call_api('media/' + video_id, video_id)
|
||||||
title = media['title']
|
title = media['title']
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
@ -114,38 +130,21 @@ def _extract_media_info(self, media):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
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',
|
|
||||||
'md5': '262bb2f257ff301115f1973540de8983',
|
|
||||||
'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.',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
|
||||||
video_id = self._match_id(url)
|
|
||||||
media = self._call_api('media/' + video_id, video_id)
|
|
||||||
return self._extract_media_info(media)
|
|
||||||
|
|
||||||
|
|
||||||
class CuriosityStreamCollectionIE(CuriosityStreamBaseIE):
|
class CuriosityStreamCollectionIE(CuriosityStreamBaseIE):
|
||||||
IE_NAME = 'curiositystream:collection'
|
IE_NAME = 'curiositystream:collection'
|
||||||
_VALID_URL = r'https?://app\.curiositystream\.com/collection/(?P<id>\d+)'
|
_VALID_URL = r'https?://(?:app\.)?curiositystream\.com/(?:collection|series)/(?P<id>\d+)'
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
'url': 'https://app.curiositystream.com/collection/2',
|
'url': 'https://app.curiositystream.com/collection/2',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '2',
|
'id': '2',
|
||||||
'title': 'Curious Minds: The Internet',
|
'title': 'Curious Minds: The Internet',
|
||||||
'description': 'How is the internet shaping our lives in the 21st Century?',
|
'description': 'How is the internet shaping our lives in the 21st Century?',
|
||||||
},
|
},
|
||||||
'playlist_mincount': 12,
|
'playlist_mincount': 17,
|
||||||
}
|
}, {
|
||||||
|
'url': 'https://curiositystream.com/series/2',
|
||||||
|
'only_matching': True,
|
||||||
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
collection_id = self._match_id(url)
|
collection_id = self._match_id(url)
|
||||||
@ -153,7 +152,10 @@ def _real_extract(self, url):
|
|||||||
'collections/' + collection_id, collection_id)
|
'collections/' + collection_id, collection_id)
|
||||||
entries = []
|
entries = []
|
||||||
for media in collection.get('media', []):
|
for media in collection.get('media', []):
|
||||||
entries.append(self._extract_media_info(media))
|
media_id = compat_str(media.get('id'))
|
||||||
|
entries.append(self.url_result(
|
||||||
|
'https://curiositystream.com/video/' + media_id,
|
||||||
|
CuriosityStreamIE.ie_key(), media_id))
|
||||||
return self.playlist_result(
|
return self.playlist_result(
|
||||||
entries, collection_id,
|
entries, collection_id,
|
||||||
collection.get('title'), collection.get('description'))
|
collection.get('title'), collection.get('description'))
|
||||||
|
Loading…
Reference in New Issue
Block a user