[extractor/generic] Improve 3qsdn embeds support (Closes #9453)

This commit is contained in:
Sergey M․ 2016-05-14 23:58:25 +06:00
parent cda6d47aad
commit 6f41b2bcf1
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -1428,7 +1428,8 @@ def _real_extract(self, url):
# Site Name | Video Title
# Video Title - Tagline | Site Name
# and so on and so forth; it's just not practical
video_title = self._html_search_regex(
video_title = self._og_search_title(
webpage, default=None) or self._html_search_regex(
r'(?s)<title>(.*?)</title>', webpage, 'video title',
default='video')
@ -1446,6 +1447,9 @@ def _real_extract(self, url):
video_uploader = self._search_regex(
r'^(?:https?://)?([^/]*)/.*', url, 'video uploader')
video_description = self._og_search_description(webpage, default=None)
video_thumbnail = self._og_search_thumbnail(webpage, default=None)
# Helper method
def _playlist_from_matches(matches, getter=None, ie=None):
urlrs = orderedSet(
@ -1987,7 +1991,15 @@ def _playlist_from_matches(matches, getter=None, ie=None):
# Look for 3Q SDN embeds
threeqsdn_url = ThreeQSDNIE._extract_url(webpage)
if threeqsdn_url:
return self.url_result(self._proto_relative_url(threeqsdn_url), ThreeQSDNIE.ie_key())
return {
'_type': 'url_transparent',
'ie_key': ThreeQSDNIE.ie_key(),
'url': self._proto_relative_url(threeqsdn_url),
'title': video_title,
'description': video_description,
'thumbnail': video_thumbnail,
'uploader': video_uploader,
}
def check_video(vurl):
if YoutubeIE.suitable(vurl):