projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b37e47a
)
[tele5] Prefer jwplatform over nexx (closes #25533)
author
Sergey M․
<dstftw@gmail.com>
Fri, 5 Jun 2020 18:35:09 +0000
(
01:35
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 5 Jun 2020 18:35:09 +0000
(
01:35
+0700)
youtube_dl/extractor/tele5.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/tele5.py
b/youtube_dl/extractor/tele5.py
index 364556a1f89d3c1943950c1634bbfae0639a3e7d..c209eb04f35cb48070122b9bf91d57d44a8bafd6 100644
(file)
--- 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 .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):
class Tele5IE(InfoExtractor):
@@
-30,6
+24,21
@@
class Tele5IE(InfoExtractor):
'params': {
'skip_download': True,
},
'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,
}, {
'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')
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)
return self.url_result(
'jwplatform:%s' % jwplatform_id, ie=JWPlatformIE.ie_key(),
video_id=jwplatform_id)