diff options
| author | remitamine <remitamine@gmail.com> | 2015-10-15 23:27:46 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2015-10-15 23:27:46 +0100 |
| commit | 77302fe5c989b9cafcb675c0a03642b80fa557ff (patch) | |
| tree | 12ab95f45b534f2e284307a99165992bfba9ee42 /youtube_dl/extractor/cinemassacre.py | |
| parent | fafc7950e2230bf25ac7c7563f1704cf8f134f64 (diff) | |
| download | youtube-dl-77302fe5c989b9cafcb675c0a03642b80fa557ff.tar.xz | |
[bliptv] remove extractor and add support for site replacement(makertv)
Diffstat (limited to 'youtube_dl/extractor/cinemassacre.py')
| -rw-r--r-- | youtube_dl/extractor/cinemassacre.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/youtube_dl/extractor/cinemassacre.py b/youtube_dl/extractor/cinemassacre.py index fd1770dac..6d9cd8abd 100644 --- a/youtube_dl/extractor/cinemassacre.py +++ b/youtube_dl/extractor/cinemassacre.py @@ -5,7 +5,6 @@ import re from .common import InfoExtractor from ..utils import ExtractorError -from .bliptv import BlipTVIE from .screenwavemedia import ScreenwaveMediaIE @@ -34,18 +33,17 @@ class CinemassacreIE(InfoExtractor): }, }, { - # blip.tv embedded video + # Youtube embedded video 'url': 'http://cinemassacre.com/2006/12/07/chronologically-confused-about-bad-movie-and-video-game-sequel-titles/', - 'md5': 'ca9b3c8dd5a66f9375daeb5135f5a3de', + 'md5': 'df4cf8a1dcedaec79a73d96d83b99023', 'info_dict': { - 'id': '4065369', - 'ext': 'flv', + 'id': 'OEVzPCY2T-g', + 'ext': 'mp4', 'title': 'AVGN: Chronologically Confused about Bad Movie and Video Game Sequel Titles', 'upload_date': '20061207', - 'uploader': 'cinemassacre', - 'uploader_id': '250778', - 'timestamp': 1283233867, - 'description': 'md5:0a108c78d130676b207d0f6d029ecffd', + 'uploader': 'Cinemassacre', + 'uploader_id': 'JamesNintendoNerd', + 'description': 'md5:784734696c2b8b7f4b8625cc799e07f6', } }, { @@ -89,8 +87,6 @@ class CinemassacreIE(InfoExtractor): ], webpage, 'player data URL', default=None, group='url') if not playerdata_url: - playerdata_url = BlipTVIE._extract_url(webpage) - if not playerdata_url: raise ExtractorError('Unable to find player data') video_title = self._html_search_regex( |