[tutv] Replace 404 test and modernize

This commit is contained in:
Sergey M․ 2014-07-15 19:32:42 +07:00
parent 00a82ea805
commit bd1f325b42

View File

@ -1,21 +1,21 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import base64 import base64
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import compat_parse_qs
compat_parse_qs,
)
class TutvIE(InfoExtractor): class TutvIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?tu\.tv/videos/(?P<id>[^/?]+)' _VALID_URL = r'https?://(?:www\.)?tu\.tv/videos/(?P<id>[^/?]+)'
_TEST = { _TEST = {
'url': 'http://tu.tv/videos/noah-en-pabellon-cuahutemoc', 'url': 'http://tu.tv/videos/robots-futbolistas',
'file': '2742556.flv', 'md5': '627c7c124ac2a9b5ab6addb94e0e65f7',
'md5': '5eb766671f69b82e528dc1e7769c5cb2',
'info_dict': { 'info_dict': {
'title': 'Noah en pabellon cuahutemoc', 'id': '2973058',
'ext': 'flv',
'title': 'Robots futbolistas',
}, },
} }
@ -26,10 +26,9 @@ class TutvIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
internal_id = self._search_regex(r'codVideo=([0-9]+)', webpage, 'internal video ID') internal_id = self._search_regex(r'codVideo=([0-9]+)', webpage, 'internal video ID')
data_url = 'http://tu.tv/flvurl.php?codVideo=' + str(internal_id) data_content = self._download_webpage(
data_content = self._download_webpage(data_url, video_id, note='Downloading video info') 'http://tu.tv/flvurl.php?codVideo=%s' % internal_id, video_id, 'Downloading video info')
data = compat_parse_qs(data_content) video_url = base64.b64decode(compat_parse_qs(data_content)['kpt'][0]).decode('utf-8')
video_url = base64.b64decode(data['kpt'][0]).decode('utf-8')
return { return {
'id': internal_id, 'id': internal_id,