X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftrutube.py;h=d55e0c563998bb1f4c38b973519ec420b6b41a8c;hb=9558dcec9c7806c811f4fe8e7758977eaa01a702;hp=37d3af0ca7a06216218e2ceda7ec4587a2e7b709;hpb=af284c6d1b2833e1d3d3619306efca764e3e59af;p=youtube-dl

diff --git a/youtube_dl/extractor/trutube.py b/youtube_dl/extractor/trutube.py
index 37d3af0ca..d55e0c563 100644
--- a/youtube_dl/extractor/trutube.py
+++ b/youtube_dl/extractor/trutube.py
@@ -1,43 +1,26 @@
-import re
+from __future__ import unicode_literals
 
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-)
+from .nuevo import NuevoBaseIE
 
 
-class TruTubeIE(InfoExtractor):
-    _VALID_URL = r'(?:https?://)?(?:www\.)?(?P<url>trutube\.tv/video/(?P<videoid>.*/.*))'
-    _TEST = {
-        'url': ('http://www.trutube.tv/video/20814/Ernst-Zundel-met-les-Jui'
-                'fs-en-guarde-VOSTFR'),
-        'md5': '9973aa3c2870626799d2ac4e36cfc3dc',
+class TruTubeIE(NuevoBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?trutube\.tv/(?:video/|nuevo/player/embed\.php\?v=)(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'http://trutube.tv/video/14880/Ramses-II-Proven-To-Be-A-Red-Headed-Caucasoid-',
+        'md5': 'c5b6e301b0a2040b074746cbeaa26ca1',
         'info_dict': {
-            u"title": u"TruTube.TV - Spitting in the face of die-versity",
-            u"ext": u"mp4"
+            'id': '14880',
+            'ext': 'flv',
+            'title': 'Ramses II - Proven To Be A Red Headed Caucasoid',
+            'thumbnail': 're:^http:.*\.jpg$',
         }
-    }
+    }, {
+        'url': 'https://trutube.tv/nuevo/player/embed.php?v=14880',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-
-        video_id = mobj.group('videoid')
-
-        # Get webpage content
-        webpage = self._download_webpage(url, video_id)
-
-        # Get the video title
-        video_title = self._html_search_regex(r'<title>(?P<title>.*)</title>',
-                                              webpage, 'title').strip()
-
-        video_url = self._search_regex(r'(http://.*\.(?:mp4|flv))',
-                                       webpage, u'video URL')
-
-        ext = video_url[-3:]
-
-        return {
-            'id': video_id,
-            'url': video_url,
-            'title': video_title,
-            'ext': ext
-            }
+        video_id = self._match_id(url)
+        return self._extract_nuevo(
+            'https://trutube.tv/nuevo/player/config.php?v=%s' % video_id,
+            video_id)