|
@@ -4,7 +4,9 @@ from __future__ import unicode_literals
|
|
from .common import InfoExtractor
|
|
from .common import InfoExtractor
|
|
from ..utils import (
|
|
from ..utils import (
|
|
float_or_none,
|
|
float_or_none,
|
|
|
|
+ int_or_none,
|
|
smuggle_url,
|
|
smuggle_url,
|
|
|
|
+ strip_or_none,
|
|
)
|
|
)
|
|
|
|
|
|
|
|
|
|
@@ -23,7 +25,8 @@ class TVAIE(InfoExtractor):
|
|
'params': {
|
|
'params': {
|
|
# m3u8 download
|
|
# m3u8 download
|
|
'skip_download': True,
|
|
'skip_download': True,
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ 'skip': 'HTTP Error 404: Not Found',
|
|
}, {
|
|
}, {
|
|
'url': 'https://video.tva.ca/details/_5596811470001',
|
|
'url': 'https://video.tva.ca/details/_5596811470001',
|
|
'only_matching': True,
|
|
'only_matching': True,
|
|
@@ -32,26 +35,54 @@ class TVAIE(InfoExtractor):
|
|
|
|
|
|
def _real_extract(self, url):
|
|
def _real_extract(self, url):
|
|
video_id = self._match_id(url)
|
|
video_id = self._match_id(url)
|
|
- video_data = self._download_json(
|
|
|
|
- 'https://videos.tva.ca/proxy/item/_' + video_id, video_id, headers={
|
|
|
|
- 'Accept': 'application/json',
|
|
|
|
- }, query={
|
|
|
|
- 'appId': '5955fc5f23eec60006c951f1',
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
- def get_attribute(key):
|
|
|
|
- for attribute in video_data.get('attributes', []):
|
|
|
|
- if attribute.get('key') == key:
|
|
|
|
- return attribute.get('value')
|
|
|
|
- return None
|
|
|
|
|
|
|
|
return {
|
|
return {
|
|
'_type': 'url_transparent',
|
|
'_type': 'url_transparent',
|
|
'id': video_id,
|
|
'id': video_id,
|
|
- 'title': get_attribute('title'),
|
|
|
|
'url': smuggle_url(self.BRIGHTCOVE_URL_TEMPLATE % video_id, {'geo_countries': ['CA']}),
|
|
'url': smuggle_url(self.BRIGHTCOVE_URL_TEMPLATE % video_id, {'geo_countries': ['CA']}),
|
|
- 'description': get_attribute('description'),
|
|
|
|
- 'thumbnail': get_attribute('image-background') or get_attribute('image-landscape'),
|
|
|
|
- 'duration': float_or_none(get_attribute('video-duration'), 1000),
|
|
|
|
'ie_key': 'BrightcoveNew',
|
|
'ie_key': 'BrightcoveNew',
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+class QubIE(InfoExtractor):
|
|
|
|
+ _VALID_URL = r'https?://(?:www\.)?qub\.ca/(?:[^/]+/)*[0-9a-z-]+-(?P<id>\d+)'
|
|
|
|
+ _TESTS = [{
|
|
|
|
+ 'url': 'https://www.qub.ca/tvaplus/tva/alerte-amber/saison-1/episode-01-1000036619',
|
|
|
|
+ 'md5': '949490fd0e7aee11d0543777611fbd53',
|
|
|
|
+ 'info_dict': {
|
|
|
|
+ 'id': '6084352463001',
|
|
|
|
+ 'ext': 'mp4',
|
|
|
|
+ 'title': 'Épisode 01',
|
|
|
|
+ 'uploader_id': '5481942443001',
|
|
|
|
+ 'upload_date': '20190907',
|
|
|
|
+ 'timestamp': 1567899756,
|
|
|
|
+ 'description': 'md5:9c0d7fbb90939420c651fd977df90145',
|
|
|
|
+ },
|
|
|
|
+ }, {
|
|
|
|
+ 'url': 'https://www.qub.ca/tele/video/lcn-ca-vous-regarde-rev-30s-ap369664-1009357943',
|
|
|
|
+ 'only_matching': True,
|
|
|
|
+ }]
|
|
|
|
+ # reference_id also works with old account_id(5481942443001)
|
|
|
|
+ # BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/5813221784001/default_default/index.html?videoId=ref:%s'
|
|
|
|
+
|
|
|
|
+ def _real_extract(self, url):
|
|
|
|
+ entity_id = self._match_id(url)
|
|
|
|
+ entity = self._download_json(
|
|
|
|
+ 'https://www.qub.ca/proxy/pfu/content-delivery-service/v1/entities',
|
|
|
|
+ entity_id, query={'id': entity_id})
|
|
|
|
+ video_id = entity['videoId']
|
|
|
|
+ episode = strip_or_none(entity.get('name'))
|
|
|
|
+
|
|
|
|
+ return {
|
|
|
|
+ '_type': 'url_transparent',
|
|
|
|
+ 'id': video_id,
|
|
|
|
+ 'title': episode,
|
|
|
|
+ # 'url': self.BRIGHTCOVE_URL_TEMPLATE % entity['referenceId'],
|
|
|
|
+ 'url': 'https://videos.tva.ca/details/_' + video_id,
|
|
|
|
+ 'description': entity.get('longDescription'),
|
|
|
|
+ 'duration': float_or_none(entity.get('durationMillis'), 1000),
|
|
|
|
+ 'episode': episode,
|
|
|
|
+ 'episode_number': int_or_none(entity.get('episodeNumber')),
|
|
|
|
+ # 'ie_key': 'BrightcoveNew',
|
|
|
|
+ 'ie_key': TVAIE.ie_key(),
|
|
|
|
+ }
|