Merge branch 'brightcove_in_page_embed' of https://github.com/remitamine/youtube-dl into remitamine-brightcove_in_page_embed

This commit is contained in:
Sergey M․ 2015-11-14 01:23:15 +06:00
commit a2973eb597
4 changed files with 128 additions and 2 deletions

View file

@ -30,7 +30,10 @@ from ..utils import (
url_basename,
xpath_text,
)
from .brightcove import BrightcoveIE
from .brightcove import (
BrightcoveIE,
BrightcoveInPageEmbedIE,
)
from .nbc import NBCSportsVPlayerIE
from .ooyala import OoyalaIE
from .rutv import RUTVIE
@ -1031,6 +1034,17 @@ class GenericIE(InfoExtractor):
'ext': 'mp4',
'title': 'cinemasnob',
},
},
# BrightcoveInPageEmbed embed
{
'url': 'http://www.geekandsundry.com/tabletop-bonus-wils-final-thoughts-on-dread/',
'info_dict': {
'id': '4238694884001',
'ext': 'flv',
'title': 'Tabletop: Dread, Last Thoughts',
'description': 'Tabletop: Dread, Last Thoughts',
'duration': 51690,
},
}
]
@ -1307,6 +1321,11 @@ class GenericIE(InfoExtractor):
'entries': entries,
}
# Look for Brightcove In Page Embed:
brightcove_in_page_embed_url = BrightcoveInPageEmbedIE._extract_url(webpage)
if brightcove_in_page_embed_url:
return self.url_result(brightcove_in_page_embed_url, 'BrightcoveInPageEmbed')
# Look for embedded rtl.nl player
matches = re.findall(
r'<iframe[^>]+?src="((?:https?:)?//(?:www\.)?rtl\.nl/system/videoplayer/[^"]+(?:video_)?embed[^"]+)"',