[canalc2] Small improvements

This commit is contained in:
Philipp Hagemeister 2013-08-27 10:35:20 +02:00
parent aa5a63a5b5
commit e86ea47c02

View File

@ -1,17 +1,17 @@
# coding: utf-8 # coding: utf-8
"""Extractor for canalc2.tv"""
import re import re
from .common import InfoExtractor from .common import InfoExtractor
class Canalc2IE(InfoExtractor): class Canalc2IE(InfoExtractor):
"""Extractor for canalc2.tv""" _IE_NAME = 'canalc2.tv'
_VALID_URL = r'http://.*?\.canalc2\.tv/video\.asp\?idVideo=(\d+)&voir=oui' _VALID_URL = r'http://.*?\.canalc2\.tv/video\.asp\?idVideo=(\d+)&voir=oui'
_TEST = { _TEST = {
u'url': u'http://www.canalc2.tv/video.asp?idVideo=12163&voir=oui', u'url': u'http://www.canalc2.tv/video.asp?idVideo=12163&voir=oui',
u'file': u'12163.mp4', u'file': u'12163.mp4',
u'md5': u'c00fa80517373764ff5c0b5eb5a58780', u'md5': u'060158428b650f896c542dfbb3d6487f',
u'info_dict': { u'info_dict': {
u'title': u'Terrasses du Numérique' u'title': u'Terrasses du Numérique'
} }
@ -20,16 +20,16 @@ class Canalc2IE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = re.match(self._VALID_URL, url).group(1) video_id = re.match(self._VALID_URL, url).group(1)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
file_name = re.search(r"so\.addVariable\('file','(.*?)'\);", file_name = self._search_regex(
webpage).group(1) r"so\.addVariable\('file','(.*?)'\);",
webpage, 'file name')
video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file_name video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file_name
title = self._html_search_regex(r'class="evenement8">(.*?)</a>', title = self._html_search_regex(
webpage, u'title') r'class="evenement8">(.*?)</a>', webpage, u'title')
return {'id': video_id, return {'id': video_id,
'ext': 'mp4', 'ext': 'mp4',
'url': video_url, 'url': video_url,
'title' : title 'title': title,
} }