projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d3a3a9
)
[tv2] detect DRM protection
author
Remita Amine
<remitamine@gmail.com>
Sat, 30 Nov 2019 14:50:17 +0000
(15:50 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Sat, 30 Nov 2019 14:50:17 +0000
(15:50 +0100)
youtube_dl/extractor/tv2.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tv2.py
b/youtube_dl/extractor/tv2.py
index e8aaa2f142a985cf74a30858fffb2c7b1415662a..4a19b9be63a6369bd9006da2c6f4af951d23b4b2 100644
(file)
--- a/
youtube_dl/extractor/tv2.py
+++ b/
youtube_dl/extractor/tv2.py
@@
-79,9
+79,10
@@
class TV2IE(InfoExtractor):
formats.extend(self._extract_f4m_formats(
video_url, video_id, f4m_id=format_id, fatal=False))
elif ext == 'm3u8':
formats.extend(self._extract_f4m_formats(
video_url, video_id, f4m_id=format_id, fatal=False))
elif ext == 'm3u8':
- formats.extend(self._extract_m3u8_formats(
- video_url, video_id, 'mp4', entry_protocol='m3u8_native',
- m3u8_id=format_id, fatal=False))
+ if not data.get('drmProtected'):
+ formats.extend(self._extract_m3u8_formats(
+ video_url, video_id, 'mp4', entry_protocol='m3u8_native',
+ m3u8_id=format_id, fatal=False))
elif ext == 'mpd':
formats.extend(self._extract_mpd_formats(
video_url, video_id, format_id, fatal=False))
elif ext == 'mpd':
formats.extend(self._extract_mpd_formats(
video_url, video_id, format_id, fatal=False))
@@
-94,6
+95,8
@@
class TV2IE(InfoExtractor):
'tbr': int_or_none(item.get('bitrate')),
'filesize': int_or_none(item.get('fileSize')),
})
'tbr': int_or_none(item.get('bitrate')),
'filesize': int_or_none(item.get('fileSize')),
})
+ if not formats and data.get('drmProtected'):
+ raise ExtractorError('This video is DRM protected.', expected=True)
self._sort_formats(formats)
asset = self._download_json(
self._sort_formats(formats)
asset = self._download_json(
@@
-104,7
+107,7
@@
class TV2IE(InfoExtractor):
thumbnails = [{
'id': thumbnail.get('@type'),
'url': thumbnail.get('url'),
thumbnails = [{
'id': thumbnail.get('@type'),
'url': thumbnail.get('url'),
- } for _, thumbnail in
asset.get('imageVersions',
{}).items()]
+ } for _, thumbnail in
(asset.get('imageVersions') or
{}).items()]
return {
'id': video_id,
return {
'id': video_id,