Merge tag 'upstream/2014.10.30'

[youtubedl] / youtube_dl / extractor / tutv.py

diff --git a/youtube_dl/extractor/tutv.py b/youtube_dl/extractor/tutv.py
index fcaa6ac01af6d778e43aa7b35d92d3dcc9478911..d516b6427bd271fa8f7e1129cdbbcd9dda692ae1 100644 (file)
--- a/youtube_dl/extractor/tutv.py
+++ b/youtube_dl/extractor/tutv.py
@@ -1,20 +1,22 @@
+from __future__ import unicode_literals
+

 import base64
 import re
 
 from .common import InfoExtractor
 import base64
 import re
 
 from .common import InfoExtractor

-from ..utils import (
-    compat_parse_qs,
-)
+from ..utils import 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 = {

-        u'url': u'http://tu.tv/videos/noah-en-pabellon-cuahutemoc',
-        u'file': u'2742556.flv',
-        u'md5': u'5eb766671f69b82e528dc1e7769c5cb2',
-        u'info_dict': {
-            u"title": u"Noah en pabellon cuahutemoc"
-        }
+        'url': 'http://tu.tv/videos/robots-futbolistas',
+        'md5': '627c7c124ac2a9b5ab6addb94e0e65f7',
+        'info_dict': {
+            'id': '2973058',
+            'ext': 'flv',
+            'title': 'Robots futbolistas',
+        },

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):


@@ -22,20 +24,14 @@ class TutvIE(InfoExtractor):
         video_id = mobj.group('id')
 
         webpage = self._download_webpage(url, video_id)
         video_id = mobj.group('id')
 
         webpage = self._download_webpage(url, video_id)

-        title = self._html_search_regex(
-            r'<meta property="og:title" content="(.*?)">', webpage, u'title')
-        internal_id = self._search_regex(r'codVideo=([0-9]+)', webpage, u'internal video ID')
+        internal_id = self._search_regex(r'codVideo=([0-9]+)', webpage, 'internal video ID')

 
 

-        data_url = u'http://tu.tv/flvurl.php?codVideo=' + str(internal_id)
-        data_content = self._download_webpage(data_url, video_id, note=u'Downloading video info')
-        data = compat_parse_qs(data_content)
-        video_url = base64.b64decode(data['kpt'][0]).decode('utf-8')
-        ext = video_url.partition(u'?')[0].rpartition(u'.')[2]
+        data_content = self._download_webpage(
+            'http://tu.tv/flvurl.php?codVideo=%s' % internal_id, video_id, 'Downloading video info')
+        video_url = base64.b64decode(compat_parse_qs(data_content)['kpt'][0]).decode('utf-8')

 
 

-        info = {
+        return {

             'id': internal_id,
             'url': video_url,
             'id': internal_id,
             'url': video_url,

-            'ext': ext,
-            'title': title,
+            'title': self._og_search_title(webpage),

         }
         }

-        return [info]