github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

[Cinemassacre] Support Youtube embedded videos (fixes #5131)

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-04-21 15:20:40 +08:00
parent e94443de80
commit 757cda0a96
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
youtube_dl/extractor/cinemassacre.py
View file

@ -33,6 +33,7 @@ class CinemassacreIE(InfoExtractor):
}, },
}, },
{ {
# blip.tv embedded video
'url': 'http://cinemassacre.com/2006/12/07/chronologically-confused-about-bad-movie-and-video-game-sequel-titles/', 'url': 'http://cinemassacre.com/2006/12/07/chronologically-confused-about-bad-movie-and-video-game-sequel-titles/',
'md5': 'ca9b3c8dd5a66f9375daeb5135f5a3de', 'md5': 'ca9b3c8dd5a66f9375daeb5135f5a3de',
'info_dict': { 'info_dict': {
@ -45,6 +46,20 @@ class CinemassacreIE(InfoExtractor):
'timestamp': 1283233867, 'timestamp': 1283233867,
'description': 'md5:0a108c78d130676b207d0f6d029ecffd', 'description': 'md5:0a108c78d130676b207d0f6d029ecffd',
} }
},
{
# Youtube embedded video
'url': 'http://cinemassacre.com/2006/09/01/mckids/',
'md5': '6eb30961fa795fedc750eac4881ad2e1',
'info_dict': {
'id': 'FnxsNhuikpo',
'ext': 'mp4',
'upload_date': '20060901',
'uploader': 'Cinemassacre Extras',
'description': 'md5:de9b751efa9e45fbaafd9c8a1123ed53',
'uploader_id': 'Cinemassacre',
'title': 'AVGN: McKids',
}
} }
] ]
@ -56,7 +71,10 @@ class CinemassacreIE(InfoExtractor):
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
playerdata_url = self._search_regex( playerdata_url = self._search_regex(
[
r'src="(http://player\.screenwavemedia\.com/play/[a-zA-Z]+\.php\?[^"]*\bid=.+?)"', r'src="(http://player\.screenwavemedia\.com/play/[a-zA-Z]+\.php\?[^"]*\bid=.+?)"',
r'<iframe[^>]+src="((?:https?:)?//(?:[^.]+\.)?youtube\.com/.+?)"',
],
webpage, 'player data URL', default=None) webpage, 'player data URL', default=None)
if not playerdata_url: if not playerdata_url:
playerdata_url = BlipTVIE._extract_url(webpage) playerdata_url = BlipTVIE._extract_url(webpage)