aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-01-18 22:08:31 +0700
committerSergey M․ <dstftw@gmail.com>2017-01-18 22:17:47 +0700
commitb687c85eab942553e925256ad10de693227ba553 (patch)
tree51d35df19264c891dfc22c7d581335c2a357ac30
parent538b17a09c6546d58babc5eb4a3abc08dcff2d89 (diff)
downloadyoutube-dl-b687c85eab942553e925256ad10de693227ba553.tar.xz
[extractor/generic] Add support for 20 minuten embeds (closes #11683, closes #11751)
-rw-r--r--youtube_dl/extractor/generic.py21
1 files changed, 21 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index a3ac7d26b..154545df7 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -78,6 +78,7 @@ from .vbox7 import Vbox7IE
from .dbtv import DBTVIE
from .piksel import PikselIE
from .videa import VideaIE
+from .twentymin import TwentyMinutenIE
class GenericIE(InfoExtractor):
@@ -1468,6 +1469,20 @@ class GenericIE(InfoExtractor):
},
'playlist_mincount': 2,
},
+ {
+ # 20 minuten embed
+ 'url': 'http://www.20min.ch/schweiz/news/story/So-kommen-Sie-bei-Eis-und-Schnee-sicher-an-27032552',
+ 'info_dict': {
+ 'id': '523629',
+ 'ext': 'mp4',
+ 'title': 'So kommen Sie bei Eis und Schnee sicher an',
+ 'description': 'md5:117c212f64b25e3d95747e5276863f7d',
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ 'add_ie': [TwentyMinutenIE.ie_key()],
+ }
# {
# # TODO: find another test
# # http://schema.org/VideoObject
@@ -2421,6 +2436,12 @@ class GenericIE(InfoExtractor):
if videa_urls:
return _playlist_from_matches(videa_urls, ie=VideaIE.ie_key())
+ # Look for 20 minuten embeds
+ twentymin_urls = TwentyMinutenIE._extract_urls(webpage)
+ if twentymin_urls:
+ return _playlist_from_matches(
+ twentymin_urls, ie=TwentyMinutenIE.ie_key())
+
# Looking for http://schema.org/VideoObject
json_ld = self._search_json_ld(
webpage, video_id, default={}, expected_type='VideoObject')