From: Philipp Hagemeister Date: Tue, 10 Feb 2015 04:42:41 +0000 (+0100) Subject: [ccc] Add new extractor (Fixes #4890) X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=8f84f5718319293485eef7174702340f109c7227;p=youtube-dl [ccc] Add new extractor (Fixes #4890) --- diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index fb1e7f325..da3b2b2d0 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -54,6 +54,7 @@ from .canalplus import CanalplusIE from .canalc2 import Canalc2IE from .cbs import CBSIE from .cbsnews import CBSNewsIE +from .ccc import CCCIE from .ceskatelevize import CeskaTelevizeIE from .channel9 import Channel9IE from .chilloutzone import ChilloutzoneIE diff --git a/youtube_dl/extractor/ccc.py b/youtube_dl/extractor/ccc.py new file mode 100644 index 000000000..2a5d4be18 --- /dev/null +++ b/youtube_dl/extractor/ccc.py @@ -0,0 +1,99 @@ +from __future__ import unicode_literals + +import re + +from .common import InfoExtractor +from ..utils import ( + int_or_none, + qualities, + unified_strdate, +) + + +class CCCIE(InfoExtractor): + IE_NAME = 'media.ccc.de' + _VALID_URL = r'https?://(?:www\.)?media\.ccc\.de/[^?#]+/[^?#/]*?_(?P[0-9]{8,})._[^?#/]*\.html' + + _TEST = { + 'url': 'http://media.ccc.de/browse/congress/2013/30C3_-_5443_-_en_-_saal_g_-_201312281830_-_introduction_to_processor_design_-_byterazor.html#video', + 'md5': '205a365d0d57c0b1e43a12c9ffe8f9be', + 'info_dict': { + 'id': '20131228183', + 'ext': 'mp4', + 'title': 'Introduction to Processor Design', + 'description': 'md5:5ddbf8c734800267f2cee4eab187bc1b', + 'thumbnail': 're:^https?://.*\.jpg$', + 'view_count': int, + 'upload_date': '20131229', + } + } + + def _real_extract(self, url): + video_id = self._match_id(url) + webpage = self._download_webpage(url, video_id) + + if self._downloader.params.get('prefer_free_formats'): + preference = qualities(['mp3', 'opus', 'mp4-lq', 'webm-lq', 'h264-sd', 'mp4-sd', 'webm-sd', 'mp4', 'webm', 'mp4-hd', 'h264-hd', 'webm-hd']) + else: + preference = qualities(['opus', 'mp3', 'webm-lq', 'mp4-lq', 'webm-sd', 'h264-sd', 'mp4-sd', 'webm', 'mp4', 'webm-hd', 'mp4-hd', 'h264-hd']) + + title = self._html_search_regex( + r'(?s)

(.*?)

', webpage, 'title') + description = self._html_search_regex( + r"(?s)

(.*?)

", + webpage, 'description', fatal=False) + upload_date = unified_strdate(self._html_search_regex( + r"(?s)(.*?)", + webpage, 'upload date', fatal=False)) + view_count = int_or_none(self._html_search_regex( + r"(?s)(.*?)", + webpage, 'view count', fatal=False)) + + matches = re.finditer(r'''(?xs) + <(?:span|div)\s+class='label\s+filetype'>(?P.*?)\s* + [^']+)'>\s* + (?: + .*? + [^']+\.torrent)' + )?''', webpage) + formats = [] + for m in matches: + format = m.group('format') + format_id = self._search_regex( + r'.*/([a-z0-9_-]+)/[^/]*$', + m.group('http_url'), 'format id', default=None) + vcodec = 'h264' if 'h264' in format_id else ( + 'none' if format_id in ('mp3', 'opus') else None + ) + formats.append({ + 'format_id': format_id, + 'format': format, + 'url': m.group('http_url'), + 'vcodec': vcodec, + 'preference': preference(format_id), + }) + + if m.group('torrent_url'): + formats.append({ + 'format_id': 'torrent-%s' % (format if format_id is None else format_id), + 'format': '%s (torrent)' % format, + 'proto': 'torrent', + 'format_note': '(unsupported; will just download the .torrent file)', + 'vcodec': vcodec, + 'preference': -100 + preference(format_id), + 'url': m.group('torrent_url'), + }) + self._sort_formats(formats) + + thumbnail = self._html_search_regex( + r"