[trutv] fix extraction(closes #17336)

youtube_dl/extractor/trutv.py

@@ -4,44 +4,72 @@ from __future__ import unicode_literals
 import re
 
 from .turner import TurnerBaseIE
+from ..utils import (
+    int_or_none,
+    parse_iso8601,
+)
 
 
 class TruTVIE(TurnerBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?trutv\.com(?:(?P<path>/shows/[^/]+/videos/[^/?#]+?)\.html|/full-episodes/[^/]+/(?P<id>\d+))'
+    _VALID_URL = r'https?://(?:www\.)?trutv\.com/(?:shows|full-episodes)/(?P<series_slug>[0-9A-Za-z-]+)/(?:videos/(?P<clip_slug>[0-9A-Za-z-]+)|(?P<id>\d+))'
     _TEST = {
-        'url': 'http://www.trutv.com/shows/10-things/videos/you-wont-believe-these-sports-bets.html',
+        'url': 'https://www.trutv.com/shows/the-carbonaro-effect/videos/sunlight-activated-flower.html',
-        'md5': '2cdc844f317579fed1a7251b087ff417',
         'info_dict': {
-            'id': '/shows/10-things/videos/you-wont-believe-these-sports-bets',
+            'id': 'f16c03beec1e84cd7d1a51f11d8fcc29124cc7f1',
             'ext': 'mp4',
-            'title': 'You Won\'t Believe These Sports Bets',
+            'title': 'Sunlight-Activated Flower',
-            'description': 'Jamie Lee sits down with a bookie to discuss the bizarre world of illegal sports betting.',
+            'description': "A customer is stunned when he sees Michael's sunlight-activated flower.",
-            'upload_date': '20130305',
+        },
-        }
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
     }
 
     def _real_extract(self, url):
-        path, video_id = re.match(self._VALID_URL, url).groups()
+        series_slug, clip_slug, video_id = re.match(self._VALID_URL, url).groups()
-        auth_required = False
+
-        if path:
+        if video_id:
-            data_src = 'http://www.trutv.com/video/cvp/v2/xml/content.xml?id=%s.xml' % path
+            path = 'episode'
+            display_id = video_id
         else:
-            webpage = self._download_webpage(url, video_id)
+            path = 'series/clip'
-            video_id = self._search_regex(
+            display_id = clip_slug
-                r"TTV\.TVE\.episodeId\s*=\s*'([^']+)';",
+
-                webpage, 'video id', default=video_id)
+        data = self._download_json(
-            auth_required = self._search_regex(
+            'https://api.trutv.com/v2/web/%s/%s/%s' % (path, series_slug, display_id),
-                r'TTV\.TVE\.authRequired\s*=\s*(true|false);',
+            display_id)
-                webpage, 'auth required', default='false') == 'true'
+        video_data = data['episode'] if video_id else data['info']
-            data_src = 'http://www.trutv.com/tveverywhere/services/cvpXML.do?titleId=' + video_id
+        media_id = video_data['mediaId']
-        return self._extract_cvp_info(
+        title = video_data['title'].strip()
-            data_src, path, {
+
-                'secure': {
+        info = self._extract_ngtv_info(
-                    'media_src': 'http://androidhls-secure.cdn.turner.com/trutv/big',
+            media_id, {}, {
-                    'tokenizer_src': 'http://www.trutv.com/tveverywhere/processors/services/token_ipadAdobe.do',
-                },
-            }, {
                 'url': url,
                 'site_name': 'truTV',
-                'auth_required': auth_required,
+                'auth_required': video_data.get('isAuthRequired'),
             })
+
+        thumbnails = []
+        for image in video_data.get('images', []):
+            image_url = image.get('srcUrl')
+            if not image_url:
+                continue
+            thumbnails.append({
+                'url': image_url,
+                'width': int_or_none(image.get('width')),
+                'height': int_or_none(image.get('height')),
+            })
+
+        info.update({
+            'id': media_id,
+            'display_id': display_id,
+            'title': title,
+            'description': video_data.get('description'),
+            'thumbnails': thumbnails,
+            'timestamp': parse_iso8601(video_data.get('publicationDate')),
+            'series': video_data.get('showTitle'),
+            'season_number': int_or_none(video_data.get('seasonNum')),
+            'episode_number': int_or_none(video_data.get('episodeNum')),
+        })
+        return info