laudom/haruhi-dl
2
0
Fork 0
Code Issues 13 Pull requests Packages Projects Releases Wiki Activity

[cinemassacre] Use screenwavemedia embed pattern

Browse source
This commit is contained in:
Sergey M․ 2015-08-29 19:06:55 +06:00
parent 678d33295b
commit 109a4156e1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/extractor/cinemassacre.py
View file

@ -6,6 +6,7 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ExtractorError from ..utils import ExtractorError
from .bliptv import BlipTVIE from .bliptv import BlipTVIE
from .screenwavemedia import ScreenwaveMediaIE
class CinemassacreIE(InfoExtractor): class CinemassacreIE(InfoExtractor):
@ -83,10 +84,10 @@ class CinemassacreIE(InfoExtractor):
playerdata_url = self._search_regex( playerdata_url = self._search_regex(
[ [
r'src="(http://(?:player2\.screenwavemedia\.com|player\.screenwavemedia\.com/play)/[a-zA-Z]+\.php\?[^"]*\bid=.+?)"', ScreenwaveMediaIE.EMBED_PATTERN,
r'<iframe[^>]+src="((?:https?:)?//(?:[^.]+\.)?youtube\.com/.+?)"', r'<iframe[^>]+src="(?P<url>(?:https?:)?//(?:[^.]+\.)?youtube\.com/.+?)"',
], ],
webpage, 'player data URL', default=None) webpage, 'player data URL', default=None, group='url')
if not playerdata_url: if not playerdata_url:
playerdata_url = BlipTVIE._extract_url(webpage) playerdata_url = BlipTVIE._extract_url(webpage)
if not playerdata_url: if not playerdata_url: