pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-03-18 14:02:21 +09:00
Code Issues Projects Releases Wiki Activity

[CinemassacreIE] Add tc_url to extracted info and fix wrong if statement

Browse Source
This commit is contained in:
rzhxeo 2013-10-19 17:41:18 +02:00
parent 68277cfc7d
commit c6279f6d9d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/cinemassacre.py
View File

@ -59,7 +59,7 @@ class CinemassacreIE(InfoExtractor):
playerdata = self._download_webpage(playerdata_url, video_id) playerdata = self._download_webpage(playerdata_url, video_id)
url = self._html_search_regex(r'\'streamer\': \'(?P<url>[^\']+)\'', playerdata, u'url') url = self._html_search_regex(r'\'streamer\': \'(?P<url>[^\']+)\'', playerdata, u'url')
player_url = self._html_search_regex(r'\'flashplayer\': \'(?P<player_url>[^\']+)\'', playerdata, u'player_url') player_url = self._html_search_regex(r'\'flashplayer\': \'(?P<player_url>[^\']+)\'', playerdata, u'player_url')
if playerdata.find('hd: { file:'): if playerdata.find('hd: { file:') != -1:
page_url = 'http://cinemassacre.com' page_url = 'http://cinemassacre.com'
else: else:
page_url = re.split(r'(?<=[^/])/([^/]|$)', player_url)[0] page_url = re.split(r'(?<=[^/])/([^/]|$)', player_url)[0]
@ -73,6 +73,7 @@ class CinemassacreIE(InfoExtractor):
'player_url': player_url, 'player_url': player_url,
'page_url': page_url, 'page_url': page_url,
'play_path': 'mp4:' + sd_file, 'play_path': 'mp4:' + sd_file,
'tc_url': url,
'ext': 'flv', 'ext': 'flv',
'format': 'sd', 'format': 'sd',
'format_id': 'sd', 'format_id': 'sd',
@ -82,6 +83,7 @@ class CinemassacreIE(InfoExtractor):
'player_url': player_url, 'player_url': player_url,
'page_url': page_url, 'page_url': page_url,
'play_path': 'mp4:' + hd_file, 'play_path': 'mp4:' + hd_file,
'tc_url': url,
'ext': 'flv', 'ext': 'flv',
'format': 'hd', 'format': 'hd',
'format_id': 'hd', 'format_id': 'hd',