[ie/crunchyroll] Fix stream extraction (#10005)

[yt-dlp.git] / yt_dlp / extractor / tbs.py

diff --git a/yt_dlp/extractor/tbs.py b/yt_dlp/extractor/tbs.py
index e8a7c65e0552b2904a48d141c6b950dd36cd44a4..808c6c73d34e876115938c2ab59108c4dbf47fc1 100644 (file)
--- a/yt_dlp/extractor/tbs.py
+++ b/yt_dlp/extractor/tbs.py
@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
 import re
 
 from .turner import TurnerBaseIE
@@ -16,7 +13,7 @@
 
 
 class TBSIE(TurnerBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?(?P<site>tbs|tntdrama)\.com(?P<path>/(?:movies|shows/[^/]+/(?:clips|season-\d+/episode-\d+))/(?P<id>[^/?#]+))'
+    _VALID_URL = r'https?://(?:www\.)?(?P<site>tbs|tntdrama)\.com(?P<path>/(?:movies|watchtnt|watchtbs|shows/[^/]+/(?:clips|season-\d+/episode-\d+))/(?P<id>[^/?#]+))'
     _TESTS = [{
         'url': 'http://www.tntdrama.com/shows/the-alienist/clips/monster',
         'info_dict': {
@@ -40,12 +37,13 @@ class TBSIE(TurnerBaseIE):
     }]
 
     def _real_extract(self, url):
-        site, path, display_id = re.match(self._VALID_URL, url).groups()
+        site, path, display_id = self._match_valid_url(url).groups()
         webpage = self._download_webpage(url, display_id)
         drupal_settings = self._parse_json(self._search_regex(
             r'<script[^>]+?data-drupal-selector="drupal-settings-json"[^>]*?>({.+?})</script>',
             webpage, 'drupal setting'), display_id)
-        video_data = next(v for v in drupal_settings['turner_playlist'] if v.get('url') == path)
+        isLive = 'watchtnt' in path or 'watchtbs' in path
+        video_data = next(v for v in drupal_settings['turner_playlist'] if isLive or v.get('url') == path)
 
         media_id = video_data['mediaID']
         title = video_data['title']
@@ -56,7 +54,8 @@ def _real_extract(self, url):
             media_id, tokenizer_query, {
                 'url': url,
                 'site_name': site[:3].upper(),
-                'auth_required': video_data.get('authRequired') == '1',
+                'auth_required': video_data.get('authRequired') == '1' or isLive,
+                'is_live': isLive
             })
 
         thumbnails = []
@@ -85,5 +84,6 @@ def _real_extract(self, url):
             'season_number': int_or_none(video_data.get('season')),
             'episode_number': int_or_none(video_data.get('episode')),
             'thumbnails': thumbnails,
+            'is_live': isLive
         })
         return info