Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-22 18:22:50 +08:00
Code Issues Releases Wiki Activity

[generic] Replace vzaar embed test

Browse Source
This commit is contained in:
Sergey M․ 2017-08-11 22:02:00 +07:00
parent 41918eaa5c
commit 1663bd6e1c
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/extractor/generic.py
View File

@ -1843,12 +1843,12 @@ class GenericIE(InfoExtractor):
}, },
{ {
# vzaar embed # vzaar embed
'url': 'http://www.xruniversity.com/bdsm-lets-begin-melissa-moore/', 'url': 'http://help.vzaar.com/article/165-embedding-video',
'md5': 'cddc9fb8a8644a0a7742149eee95080b', 'md5': '7e3919d9d2620b89e3e00bec7fe8c9d4',
'info_dict': { 'info_dict': {
'id': '11002506', 'id': '8707641',
'ext': 'mp4', 'ext': 'mp4',
'title': 'XR-U SHOW: Ready Player Fuck - EP. 61', 'title': 'Building A Business Online: Principal Chairs Q & A',
}, },
}, },
# { # {
@ -2792,12 +2792,6 @@ class GenericIE(InfoExtractor):
return self.playlist_from_matches( return self.playlist_from_matches(
videopress_urls, video_id, video_title, ie=VideoPressIE.ie_key()) videopress_urls, video_id, video_title, ie=VideoPressIE.ie_key())
# Look for vzaar embeds
vzaar_urls = VzaarIE._extract_urls(webpage)
if vzaar_urls:
return self.playlist_from_matches(
vzaar_urls, video_id, video_title, ie=VzaarIE.ie_key())
# Look for Rutube embeds # Look for Rutube embeds
rutube_urls = RutubeIE._extract_urls(webpage) rutube_urls = RutubeIE._extract_urls(webpage)
if rutube_urls: if rutube_urls:
@ -2828,6 +2822,12 @@ class GenericIE(InfoExtractor):
return self.playlist_from_matches( return self.playlist_from_matches(
mpfn_urls, video_id, video_title, ie=MegaphoneIE.ie_key()) mpfn_urls, video_id, video_title, ie=MegaphoneIE.ie_key())
# Look for vzaar embeds
vzaar_urls = VzaarIE._extract_urls(webpage)
if vzaar_urls:
return self.playlist_from_matches(
vzaar_urls, video_id, video_title, ie=VzaarIE.ie_key())
def merge_dicts(dict1, dict2): def merge_dicts(dict1, dict2):
merged = {} merged = {}
for k, v in dict1.items(): for k, v in dict1.items():