mirrors/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-05 11:01:11 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/extractor/generic.py
View File

@ -1428,7 +1428,8 @@ class GenericIE(InfoExtractor):
# Site Name | Video Title # Site Name | Video Title
# Video Title - Tagline | Site Name # Video Title - Tagline | Site Name
# and so on and so forth; it's just not practical # 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', r'(?s)<title>(.*?)</title>', webpage, 'video title',
default='video') default='video')
@ -1446,6 +1447,9 @@ class GenericIE(InfoExtractor):
video_uploader = self._search_regex( video_uploader = self._search_regex(
r'^(?:https?://)?([^/]*)/.*', url, 'video uploader') 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 # Helper method
def _playlist_from_matches(matches, getter=None, ie=None): def _playlist_from_matches(matches, getter=None, ie=None):
urlrs = orderedSet( urlrs = orderedSet(
@ -1987,7 +1991,15 @@ class GenericIE(InfoExtractor):
# Look for 3Q SDN embeds # Look for 3Q SDN embeds
threeqsdn_url = ThreeQSDNIE._extract_url(webpage) threeqsdn_url = ThreeQSDNIE._extract_url(webpage)
if threeqsdn_url: 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): def check_video(vurl):
if YoutubeIE.suitable(vurl): if YoutubeIE.suitable(vurl):