projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79b3f61
)
[CinemassacreIE] Support more embed urls
author
rzhxeo
<rzhxeot7z81b4700@mailcatch.com>
Fri, 1 Nov 2013 00:24:23 +0000
(
01:24
+0100)
committer
rzhxeo
<rzhxeot7z81b4700@mailcatch.com>
Fri, 1 Nov 2013 00:24:23 +0000
(
01:24
+0100)
youtube_dl/extractor/cinemassacre.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/cinemassacre.py
b/youtube_dl/extractor/cinemassacre.py
index 2fe1033f01d3ccc53b51f6b8c8b24efe490f5cb6..8f9396d6b438e4e7e0fa5e4cb36dc226d384e43f 100644
(file)
--- a/
youtube_dl/extractor/cinemassacre.py
+++ b/
youtube_dl/extractor/cinemassacre.py
@@
-41,7
+41,7
@@
class CinemassacreIE(InfoExtractor):
webpage_url = u'http://' + mobj.group('url')
webpage = self._download_webpage(webpage_url, None) # Don't know video id yet
video_date = mobj.group('date_Y') + mobj.group('date_m') + mobj.group('date_d')
webpage_url = u'http://' + mobj.group('url')
webpage = self._download_webpage(webpage_url, None) # Don't know video id yet
video_date = mobj.group('date_Y') + mobj.group('date_m') + mobj.group('date_d')
- mobj = re.search(r'src="(?P<embed_url>http://player\.screenwavemedia\.com/play/
(?:embed|player)
\.php\?id=(?:Cinemassacre-)?(?P<video_id>.+?))"', webpage)
+ mobj = re.search(r'src="(?P<embed_url>http://player\.screenwavemedia\.com/play/
[a-zA-Z]+
\.php\?id=(?:Cinemassacre-)?(?P<video_id>.+?))"', webpage)
if not mobj:
raise ExtractorError(u'Can\'t extract embed url and video id')
playerdata_url = mobj.group(u'embed_url')
if not mobj:
raise ExtractorError(u'Can\'t extract embed url and video id')
playerdata_url = mobj.group(u'embed_url')