projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mgtv] Extract format_note (#21881)
[youtube-dl]
/
youtube_dl
/
extractor
/
canvas.py
diff --git
a/youtube_dl/extractor/canvas.py
b/youtube_dl/extractor/canvas.py
index 174fd9e2b4b00b384b1737a1df058050e4603de9..c506bc5dd2402a95752bdf3223fe4a24cf9d06ae 100644
(file)
--- a/
youtube_dl/extractor/canvas.py
+++ b/
youtube_dl/extractor/canvas.py
@@
-17,7
+17,7
@@
from ..utils import (
class CanvasIE(InfoExtractor):
class CanvasIE(InfoExtractor):
- _VALID_URL = r'https?://mediazone\.vrt\.be/api/v1/(?P<site_id>canvas|een|ketnet|vrt
video
)/assets/(?P<id>[^/?#&]+)'
+ _VALID_URL = r'https?://mediazone\.vrt\.be/api/v1/(?P<site_id>canvas|een|ketnet|vrt
(?:video|nieuws)|sporza
)/assets/(?P<id>[^/?#&]+)'
_TESTS = [{
'url': 'https://mediazone.vrt.be/api/v1/ketnet/assets/md-ast-4ac54990-ce66-4d00-a8ca-9eac86f4c475',
'md5': '90139b746a0a9bd7bb631283f6e2a64e',
_TESTS = [{
'url': 'https://mediazone.vrt.be/api/v1/ketnet/assets/md-ast-4ac54990-ce66-4d00-a8ca-9eac86f4c475',
'md5': '90139b746a0a9bd7bb631283f6e2a64e',
@@
-35,6
+35,10
@@
class CanvasIE(InfoExtractor):
'url': 'https://mediazone.vrt.be/api/v1/canvas/assets/mz-ast-5e5f90b6-2d72-4c40-82c2-e134f884e93e',
'only_matching': True,
}]
'url': 'https://mediazone.vrt.be/api/v1/canvas/assets/mz-ast-5e5f90b6-2d72-4c40-82c2-e134f884e93e',
'only_matching': True,
}]
+ _HLS_ENTRY_PROTOCOLS_MAP = {
+ 'HLS': 'm3u8_native',
+ 'HLS_AES': 'm3u8',
+ }
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
@@
-52,9
+56,9
@@
class CanvasIE(InfoExtractor):
format_url, format_type = target.get('url'), target.get('type')
if not format_url or not format_type:
continue
format_url, format_type = target.get('url'), target.get('type')
if not format_url or not format_type:
continue
- if format_type
== 'HLS'
:
+ if format_type
in self._HLS_ENTRY_PROTOCOLS_MAP
:
formats.extend(self._extract_m3u8_formats(
formats.extend(self._extract_m3u8_formats(
- format_url, video_id, 'mp4',
entry_protocol='m3u8_native'
,
+ format_url, video_id, 'mp4',
self._HLS_ENTRY_PROTOCOLS_MAP[format_type]
,
m3u8_id=format_type, fatal=False))
elif format_type == 'HDS':
formats.extend(self._extract_f4m_formats(
m3u8_id=format_type, fatal=False))
elif format_type == 'HDS':
formats.extend(self._extract_f4m_formats(