pull/11771/head
parent
538b17a09c
commit
b687c85eab
|
@ -78,6 +78,7 @@ from .vbox7 import Vbox7IE
|
||||||
from .dbtv import DBTVIE
|
from .dbtv import DBTVIE
|
||||||
from .piksel import PikselIE
|
from .piksel import PikselIE
|
||||||
from .videa import VideaIE
|
from .videa import VideaIE
|
||||||
|
from .twentymin import TwentyMinutenIE
|
||||||
|
|
||||||
|
|
||||||
class GenericIE(InfoExtractor):
|
class GenericIE(InfoExtractor):
|
||||||
|
@ -1468,6 +1469,20 @@ class GenericIE(InfoExtractor):
|
||||||
},
|
},
|
||||||
'playlist_mincount': 2,
|
'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
|
# # TODO: find another test
|
||||||
# # http://schema.org/VideoObject
|
# # http://schema.org/VideoObject
|
||||||
|
@ -2421,6 +2436,12 @@ class GenericIE(InfoExtractor):
|
||||||
if videa_urls:
|
if videa_urls:
|
||||||
return _playlist_from_matches(videa_urls, ie=VideaIE.ie_key())
|
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
|
# Looking for http://schema.org/VideoObject
|
||||||
json_ld = self._search_json_ld(
|
json_ld = self._search_json_ld(
|
||||||
webpage, video_id, default={}, expected_type='VideoObject')
|
webpage, video_id, default={}, expected_type='VideoObject')
|
||||||
|
|
Loading…
Reference in New Issue