Skip to content

Commit

Permalink
[tele5] Prefer jwplatform over nexx (closes #25533)
Browse files Browse the repository at this point in the history
  • Loading branch information
dstftw committed Jun 5, 2020
1 parent b37e47a commit 0b1eaec
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions youtube_dl/extractor/tele5.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,8 @@
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):
Expand All @@ -30,6 +24,21 @@ class Tele5IE(InfoExtractor):
'params': {
'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,
Expand Down Expand Up @@ -88,15 +97,6 @@ def extract_id(pattern, name, default=NO_DEFAULT):
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)

0 comments on commit 0b1eaec

Please sign in to comment.