]> jfr.im git - yt-dlp.git/blobdiff - yt_dlp/extractor/wsj.py
[extractor/rutube] Extract chapters from description (#6345)
[yt-dlp.git] / yt_dlp / extractor / wsj.py
index 67236f377d2714b517b1f27e687258547c75ac62..86e2646793b127d4887ad9cbd5a86fc9036626ab 100644 (file)
@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
 from .common import InfoExtractor
 from ..utils import (
     int_or_none,
@@ -85,7 +82,6 @@ def _real_extract(self, url):
                 'height': int_or_none(v.get('height')),
                 'fps': float_or_none(v.get('fps')),
             })
-        self._sort_formats(formats)
 
         return {
             'id': video_id,
@@ -119,5 +115,6 @@ def _real_extract(self, url):
         article_id = self._match_id(url)
         webpage = self._download_webpage(url, article_id)
         video_id = self._search_regex(
-            r'data-src=["\']([a-fA-F0-9-]{36})', webpage, 'video id')
+            r'(?:id=["\']video|video-|iframe\.html\?guid=|data-src=["\'])([a-fA-F0-9-]{36})',
+            webpage, 'video id')
         return self.url_result('wsj:%s' % video_id, WSJIE.ie_key(), video_id)