summaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/extractor/tele5.py
diff options
context:
space:
mode:
authorSergey M․ <[email protected]>2020-06-06 01:35:09 +0700
committerSergey M․ <[email protected]>2020-06-06 01:35:09 +0700
commit0b1eaec3bc7f974fba4dae742516153e2f9b7562 (patch)
treee542a4742068addcb2a3483aed7c706340ddaf5f /youtube_dl/extractor/tele5.py
parentb37e47a3f980c2470882ec83dda43c8166ddb3cd (diff)
downloadyoutube-dl-0b1eaec3bc7f974fba4dae742516153e2f9b7562.tar.gz
youtube-dl-0b1eaec3bc7f974fba4dae742516153e2f9b7562.zip
[tele5] Prefer jwplatform over nexx (closes #25533)
Diffstat (limited to 'youtube_dl/extractor/tele5.py')
-rw-r--r--youtube_dl/extractor/tele5.py34
1 files changed, 17 insertions, 17 deletions
diff --git a/youtube_dl/extractor/tele5.py b/youtube_dl/extractor/tele5.py
index 364556a1f..c209eb04f 100644
--- a/youtube_dl/extractor/tele5.py
+++ b/youtube_dl/extractor/tele5.py
@@ -6,14 +6,8 @@ import re
from .common import InfoExtractor
from .jwplatform import JWPlatformIE
from .nexx import NexxIE
-from ..compat import (
- compat_str,
- compat_urlparse,
-)
-from ..utils import (
- NO_DEFAULT,
- try_get,
-)
+from ..compat import compat_urlparse
+from ..utils import NO_DEFAULT
class Tele5IE(InfoExtractor):
@@ -31,6 +25,21 @@ class Tele5IE(InfoExtractor):
'skip_download': True,
},
}, {
+ # jwplatform, nexx unavailable
+ 'url': 'https://www.tele5.de/filme/ghoul-das-geheimnis-des-friedhofmonsters/',
+ 'info_dict': {
+ 'id': 'WJuiOlUp',
+ 'ext': 'mp4',
+ 'upload_date': '20200603',
+ 'timestamp': 1591214400,
+ 'title': 'Ghoul - Das Geheimnis des Friedhofmonsters',
+ 'description': 'md5:42002af1d887ff3d5b2b3ca1f8137d97',
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ 'add_ie': [JWPlatformIE.ie_key()],
+ }, {
'url': 'https://www.tele5.de/kalkofes-mattscheibe/video-clips/politik-und-gesellschaft?ve_id=1551191',
'only_matching': True,
}, {
@@ -88,15 +97,6 @@ class Tele5IE(InfoExtractor):
if not jwplatform_id:
jwplatform_id = extract_id(JWPLATFORM_ID_RE, 'jwplatform id')
- media = self._download_json(
- 'https://cdn.jwplayer.com/v2/media/' + jwplatform_id,
- display_id)
- nexx_id = try_get(
- media, lambda x: x['playlist'][0]['nexx_id'], compat_str)
-
- if nexx_id:
- return nexx_result(nexx_id)
-
return self.url_result(
'jwplatform:%s' % jwplatform_id, ie=JWPlatformIE.ie_key(),
video_id=jwplatform_id)