1
0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-21 18:32:51 +08:00

[eitb] Modernize

This commit is contained in:
Philipp Hagemeister 2014-09-28 08:49:03 +02:00
parent 5e43e3803c
commit c95eeb7b80

View File

@ -1,4 +1,6 @@
# encoding: utf-8 # encoding: utf-8
from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
@ -7,20 +9,20 @@ from ..utils import ExtractorError
class EitbIE(InfoExtractor): class EitbIE(InfoExtractor):
IE_NAME = u'eitb.tv' IE_NAME = 'eitb.tv'
_VALID_URL = r'https?://www\.eitb\.tv/(eu/bideoa|es/video)/[^/]+/(?P<playlist_id>\d+)/(?P<chapter_id>\d+)' _VALID_URL = r'https?://www\.eitb\.tv/(eu/bideoa|es/video)/[^/]+/(?P<playlist_id>\d+)/(?P<chapter_id>\d+)'
_TEST = { _TEST = {
u'add_ie': ['Brightcove'], 'add_ie': ['Brightcove'],
u'url': u'http://www.eitb.tv/es/video/60-minutos-60-minutos-2013-2014/2677100210001/2743577154001/lasa-y-zabala-30-anos/', 'url': 'http://www.eitb.tv/es/video/60-minutos-60-minutos-2013-2014/2677100210001/2743577154001/lasa-y-zabala-30-anos/',
u'md5': u'edf4436247185adee3ea18ce64c47998', 'md5': 'edf4436247185adee3ea18ce64c47998',
u'info_dict': { 'info_dict': {
u'id': u'2743577154001', 'id': '2743577154001',
u'ext': u'mp4', 'ext': 'mp4',
u'title': u'60 minutos (Lasa y Zabala, 30 años)', 'title': '60 minutos (Lasa y Zabala, 30 años)',
# All videos from eitb has this description in the brightcove info # All videos from eitb has this description in the brightcove info
u'description': u'.', 'description': '.',
u'uploader': u'Euskal Telebista', 'uploader': 'Euskal Telebista',
}, },
} }
@ -30,7 +32,7 @@ class EitbIE(InfoExtractor):
webpage = self._download_webpage(url, chapter_id) webpage = self._download_webpage(url, chapter_id)
bc_url = BrightcoveIE._extract_brightcove_url(webpage) bc_url = BrightcoveIE._extract_brightcove_url(webpage)
if bc_url is None: if bc_url is None:
raise ExtractorError(u'Could not extract the Brightcove url') raise ExtractorError('Could not extract the Brightcove url')
# The BrightcoveExperience object doesn't contain the video id, we set # The BrightcoveExperience object doesn't contain the video id, we set
# it manually # it manually
bc_url += '&%40videoPlayer={0}'.format(chapter_id) bc_url += '&%40videoPlayer={0}'.format(chapter_id)