]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[youtube:live] Improve live detection (closes #15365)
authorSergey M․ <dstftw@gmail.com>
Sat, 20 Jan 2018 10:57:20 +0000 (17:57 +0700)
committerSergey M․ <dstftw@gmail.com>
Sat, 20 Jan 2018 10:57:20 +0000 (17:57 +0700)
youtube_dl/extractor/youtube.py

index a01ec1436ebbdd2eb8bdfe0d27306cf72bda3af5..f698a5627bb552ffa3383e03044af698d592bbb2 100644 (file)
@@ -2530,10 +2530,11 @@ class YoutubeLiveIE(YoutubeBaseInfoExtractor):
         webpage = self._download_webpage(url, channel_id, fatal=False)
         if webpage:
             page_type = self._og_search_property(
         webpage = self._download_webpage(url, channel_id, fatal=False)
         if webpage:
             page_type = self._og_search_property(
-                'type', webpage, 'page type', default=None)
+                'type', webpage, 'page type', default='')
             video_id = self._html_search_meta(
                 'videoId', webpage, 'video id', default=None)
             video_id = self._html_search_meta(
                 'videoId', webpage, 'video id', default=None)
-            if page_type == 'video' and video_id and re.match(r'^[0-9A-Za-z_-]{11}$', video_id):
+            if page_type.startswith('video') and video_id and re.match(
+                    r'^[0-9A-Za-z_-]{11}$', video_id):
                 return self.url_result(video_id, YoutubeIE.ie_key())
         return self.url_result(base_url)
 
                 return self.url_result(video_id, YoutubeIE.ie_key())
         return self.url_result(base_url)