mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-12-14 07:12:41 +00:00
[cinemassacre] Fix extraction
Now we download over http, we don't need rtmpdump.
This commit is contained in:
parent
b732f3581f
commit
47610c4d3e
1 changed files with 11 additions and 22 deletions
|
@ -11,28 +11,22 @@ class CinemassacreIE(InfoExtractor):
|
||||||
_VALID_URL = r'(?:http://)?(?:www\.)?(?P<url>cinemassacre\.com/(?P<date_Y>[0-9]{4})/(?P<date_m>[0-9]{2})/(?P<date_d>[0-9]{2})/.+?)(?:[/?].*)?'
|
_VALID_URL = r'(?:http://)?(?:www\.)?(?P<url>cinemassacre\.com/(?P<date_Y>[0-9]{4})/(?P<date_m>[0-9]{2})/(?P<date_d>[0-9]{2})/.+?)(?:[/?].*)?'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
u'url': u'http://cinemassacre.com/2012/11/10/avgn-the-movie-trailer/',
|
u'url': u'http://cinemassacre.com/2012/11/10/avgn-the-movie-trailer/',
|
||||||
u'file': u'19911.flv',
|
u'file': u'19911.mp4',
|
||||||
|
u'md5': u'fde81fbafaee331785f58cd6c0d46190',
|
||||||
u'info_dict': {
|
u'info_dict': {
|
||||||
u'upload_date': u'20121110',
|
u'upload_date': u'20121110',
|
||||||
u'title': u'“Angry Video Game Nerd: The Movie” – Trailer',
|
u'title': u'“Angry Video Game Nerd: The Movie” – Trailer',
|
||||||
u'description': u'md5:fb87405fcb42a331742a0dce2708560b',
|
u'description': u'md5:fb87405fcb42a331742a0dce2708560b',
|
||||||
},
|
},
|
||||||
u'params': {
|
|
||||||
# rtmp download
|
|
||||||
u'skip_download': True,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
u'url': u'http://cinemassacre.com/2013/10/02/the-mummys-hand-1940',
|
u'url': u'http://cinemassacre.com/2013/10/02/the-mummys-hand-1940',
|
||||||
u'file': u'521be8ef82b16.flv',
|
u'file': u'521be8ef82b16.mp4',
|
||||||
|
u'md5': u'd72f10cd39eac4215048f62ab477a511',
|
||||||
u'info_dict': {
|
u'info_dict': {
|
||||||
u'upload_date': u'20131002',
|
u'upload_date': u'20131002',
|
||||||
u'title': u'The Mummy’s Hand (1940)',
|
u'title': u'The Mummy’s Hand (1940)',
|
||||||
},
|
},
|
||||||
u'params': {
|
|
||||||
# rtmp download
|
|
||||||
u'skip_download': True,
|
|
||||||
},
|
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
|
@ -55,26 +49,21 @@ class CinemassacreIE(InfoExtractor):
|
||||||
video_description = None
|
video_description = None
|
||||||
|
|
||||||
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')
|
|
||||||
|
|
||||||
sd_file = self._html_search_regex(r'\'file\': \'(?P<sd_file>[^\']+)\'', playerdata, u'sd_file')
|
sd_url = self._html_search_regex(r'file: \'(?P<sd_file>[^\']+)\', label: \'SD\'', playerdata, u'sd_file')
|
||||||
hd_file = self._html_search_regex(r'\'?file\'?: "(?P<hd_file>[^"]+)"', playerdata, u'hd_file')
|
hd_url= self._html_search_regex(r'file: \'(?P<hd_file>[^\']+)\', label: \'HD\'', playerdata, u'hd_file')
|
||||||
video_thumbnail = self._html_search_regex(r'\'image\': \'(?P<thumbnail>[^\']+)\'', playerdata, u'thumbnail', fatal=False)
|
video_thumbnail = self._html_search_regex(r'image: \'(?P<thumbnail>[^\']+)\'', playerdata, u'thumbnail', fatal=False)
|
||||||
|
|
||||||
formats = [
|
formats = [
|
||||||
{
|
{
|
||||||
'url': url,
|
'url': sd_url,
|
||||||
'play_path': 'mp4:' + sd_file,
|
'ext': 'mp4',
|
||||||
'rtmp_live': True, # workaround
|
|
||||||
'ext': 'flv',
|
|
||||||
'format': 'sd',
|
'format': 'sd',
|
||||||
'format_id': 'sd',
|
'format_id': 'sd',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'url': url,
|
'url': hd_url,
|
||||||
'play_path': 'mp4:' + hd_file,
|
'ext': 'mp4',
|
||||||
'rtmp_live': True, # workaround
|
|
||||||
'ext': 'flv',
|
|
||||||
'format': 'hd',
|
'format': 'hd',
|
||||||
'format_id': 'hd',
|
'format_id': 'hd',
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue