.github/ISSUE_TEMPLATE/1_broken_site.md

@@ -18,7 +18,7 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.25. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
 - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -26,7 +26,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a broken site support
-- [ ] I've verified that I'm running youtube-dl version **2021.03.25**
+- [ ] I've verified that I'm running youtube-dl version **2021.03.14**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar issues including closed ones
@@ -41,7 +41,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] youtube-dl version 2021.03.25
+ [debug] youtube-dl version 2021.03.14
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}

.github/ISSUE_TEMPLATE/2_site_support_request.md

@@ -19,7 +19,7 @@ labels: 'site-support-request'
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.25. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that site you are requesting is not dedicated to copyright infringement, see https://yt-dl.org/copyright-infringement. youtube-dl does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
 - Search the bugtracker for similar site support requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -27,7 +27,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a new site support request
-- [ ] I've verified that I'm running youtube-dl version **2021.03.25**
+- [ ] I've verified that I'm running youtube-dl version **2021.03.14**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that none of provided URLs violate any copyrights
 - [ ] I've searched the bugtracker for similar site support requests including closed ones

.github/ISSUE_TEMPLATE/3_site_feature_request.md

@@ -18,13 +18,13 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.25. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
 - Finally, put x into all relevant boxes (like this [x])
 -->
 
 - [ ] I'm reporting a site feature request
-- [ ] I've verified that I'm running youtube-dl version **2021.03.25**
+- [ ] I've verified that I'm running youtube-dl version **2021.03.14**
 - [ ] I've searched the bugtracker for similar site feature requests including closed ones
 
 

.github/ISSUE_TEMPLATE/4_bug_report.md

@@ -18,7 +18,7 @@ title: ''
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.25. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
 - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
 - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@ -27,7 +27,7 @@ Carefully read and work through this check list in order to prevent the most com
 -->
 
 - [ ] I'm reporting a broken site support issue
-- [ ] I've verified that I'm running youtube-dl version **2021.03.25**
+- [ ] I've verified that I'm running youtube-dl version **2021.03.14**
 - [ ] I've checked that all provided URLs are alive and playable in a browser
 - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
 - [ ] I've searched the bugtracker for similar bug reports including closed ones
@@ -43,7 +43,7 @@ Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <
  [debug] User config: []
  [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
  [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
- [debug] youtube-dl version 2021.03.25
+ [debug] youtube-dl version 2021.03.14
  [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
  [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
  [debug] Proxy map: {}

.github/ISSUE_TEMPLATE/5_feature_request.md

@@ -19,13 +19,13 @@ labels: 'request'
 
 <!--
 Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
-- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.25. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
+- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2021.03.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 - Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
 - Finally, put x into all relevant boxes (like this [x])
 -->
 
 - [ ] I'm reporting a feature request
-- [ ] I've verified that I'm running youtube-dl version **2021.03.25**
+- [ ] I've verified that I'm running youtube-dl version **2021.03.14**
 - [ ] I've searched the bugtracker for similar feature requests including closed ones
 
 

ChangeLog

@@ -1,24 +1,3 @@
-version 2021.03.25
-
-Extractors
-+ [zoom] Add support for zoom.us (#16597, #27002, #28531)
-* [bbc] Fix BBC IPlayer Episodes/Group extraction (#28360)
-* [youtube] Fix default value for youtube_include_dash_manifest (#28523)
-* [zingmp3] Fix extraction (#11589, #16409, #16968, #27205)
-+ [vgtv] Add support for new tv.aftonbladet.se URL schema (#28514)
-+ [tiktok] Detect private videos (#28453)
-* [vimeo:album] Fix extraction for albums with number of videos multiple
-  to page size (#28486)
-* [vvvvid] Fix kenc format extraction (#28473)
-* [mlb] Fix video extraction (#21241)
-* [svtplay] Improve extraction (#28448)
-* [applepodcasts] Fix extraction (#28445)
-* [rtve] Improve extraction
-    + Extract all formats
-    * Fix RTVE Infantil extraction (#24851)
-    + Extract is_live and series
-
-
 version 2021.03.14
 
 Core

docs/supportedsites.md

@@ -90,8 +90,7 @@
  - **bbc**: BBC
  - **bbc.co.uk**: BBC iPlayer
  - **bbc.co.uk:article**: BBC articles
- - **bbc.co.uk:iplayer:episodes**
+ - **bbc.co.uk:iplayer:playlist**
- - **bbc.co.uk:iplayer:group**
  - **bbc.co.uk:playlist**
  - **BBVTV**
  - **Beatport**
@@ -523,7 +522,6 @@
  - **mixcloud:playlist**
  - **mixcloud:user**
  - **MLB**
- - **MLBVideo**
  - **Mnet**
  - **MNetTV**
  - **MoeVideo**: LetitBit video services: moevideo.net, playreplay.net and videochart.net
@@ -1214,6 +1212,4 @@
  - **ZDFChannel**
  - **Zhihu**
  - **zingmp3**: mp3.zing.vn
- - **zingmp3:album**
- - **zoom**
  - **Zype**

youtube_dl/extractor/ard.py

@@ -335,7 +335,7 @@ class ARDIE(InfoExtractor):
 
 
 class ARDBetaMediathekIE(ARDMediathekBaseIE):
-    _VALID_URL = r'https://(?:(?:beta|www)\.)?ardmediathek\.de/(?:[^/]+/)?(?:player|live|video)/(?:[^/]+/)*(?P<id>Y3JpZDovL[a-zA-Z0-9]+)'
+    _VALID_URL = r'https://(?:(?:beta|www)\.)?ardmediathek\.de/(?P<client>[^/]+)/(?:player|live|video)/(?P<display_id>(?:[^/]+/)*)(?P<video_id>[a-zA-Z0-9]+)'
     _TESTS = [{
         'url': 'https://www.ardmediathek.de/mdr/video/die-robuste-roswita/Y3JpZDovL21kci5kZS9iZWl0cmFnL2Ntcy84MWMxN2MzZC0wMjkxLTRmMzUtODk4ZS0wYzhlOWQxODE2NGI/',
         'md5': 'a1dc75a39c61601b980648f7c9f9f71d',
@@ -365,22 +365,22 @@ class ARDBetaMediathekIE(ARDMediathekBaseIE):
     }, {
         'url': 'https://www.ardmediathek.de/swr/live/Y3JpZDovL3N3ci5kZS8xMzQ4MTA0Mg',
         'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/video/coronavirus-update-ndr-info/astrazeneca-kurz-lockdown-und-pims-syndrom-81/ndr/Y3JpZDovL25kci5kZS84NzE0M2FjNi0wMWEwLTQ5ODEtOTE5NS1mOGZhNzdhOTFmOTI/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/ard/player/Y3JpZDovL3dkci5kZS9CZWl0cmFnLWQ2NDJjYWEzLTMwZWYtNGI4NS1iMTI2LTU1N2UxYTcxOGIzOQ/tatort-duo-koeln-leipzig-ihr-kinderlein-kommet',
-        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        mobj = re.match(self._VALID_URL, url)
+        video_id = mobj.group('video_id')
+        display_id = mobj.group('display_id')
+        if display_id:
+            display_id = display_id.rstrip('/')
+        if not display_id:
+            display_id = video_id
 
         player_page = self._download_json(
             'https://api.ardmediathek.de/public-gateway',
-            video_id, data=json.dumps({
+            display_id, data=json.dumps({
                 'query': '''{
-  playerPage(client: "ard", clipId: "%s") {
+  playerPage(client:"%s", clipId: "%s") {
     blockedByFsk
     broadcastedOn
     maturityContentRating
@@ -410,7 +410,7 @@ class ARDBetaMediathekIE(ARDMediathekBaseIE):
       }
     }
   }
-}''' % video_id,
+}''' % (mobj.group('client'), video_id),
             }).encode(), headers={
                 'Content-Type': 'application/json'
             })['data']['playerPage']
@@ -435,6 +435,7 @@ class ARDBetaMediathekIE(ARDMediathekBaseIE):
                 r'\(FSK\s*(\d+)\)\s*$', description, 'age limit', default=None))
         info.update({
             'age_limit': age_limit,
+            'display_id': display_id,
             'title': title,
             'description': description,
             'timestamp': unified_timestamp(player_page.get('broadcastedOn')),

youtube_dl/extractor/bbc.py

@@ -1,22 +1,17 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import functools
 import itertools
-import json
 import re
 
 from .common import InfoExtractor
 from ..compat import (
     compat_etree_Element,
     compat_HTTPError,
-    compat_parse_qs,
-    compat_urllib_parse_urlparse,
     compat_urlparse,
 )
 from ..utils import (
     ExtractorError,
-    OnDemandPagedList,
     clean_html,
     dict_get,
     float_or_none,
@@ -816,7 +811,7 @@ class BBCIE(BBCCoUkIE):
 
     @classmethod
     def suitable(cls, url):
-        EXCLUDE_IE = (BBCCoUkIE, BBCCoUkArticleIE, BBCCoUkIPlayerEpisodesIE, BBCCoUkIPlayerGroupIE, BBCCoUkPlaylistIE)
+        EXCLUDE_IE = (BBCCoUkIE, BBCCoUkArticleIE, BBCCoUkIPlayerPlaylistIE, BBCCoUkPlaylistIE)
         return (False if any(ie.suitable(url) for ie in EXCLUDE_IE)
                 else super(BBCIE, cls).suitable(url))
 
@@ -1343,149 +1338,21 @@ class BBCCoUkPlaylistBaseIE(InfoExtractor):
             playlist_id, title, description)
 
 
-class BBCCoUkIPlayerPlaylistBaseIE(InfoExtractor):
+class BBCCoUkIPlayerPlaylistIE(BBCCoUkPlaylistBaseIE):
-    _VALID_URL_TMPL = r'https?://(?:www\.)?bbc\.co\.uk/iplayer/%%s/(?P<id>%s)' % BBCCoUkIE._ID_REGEX
+    IE_NAME = 'bbc.co.uk:iplayer:playlist'
-
+    _VALID_URL = r'https?://(?:www\.)?bbc\.co\.uk/iplayer/(?:episodes|group)/(?P<id>%s)' % BBCCoUkIE._ID_REGEX
-    @staticmethod
+    _URL_TEMPLATE = 'http://www.bbc.co.uk/iplayer/episode/%s'
-    def _get_default(episode, key, default_key='default'):
+    _VIDEO_ID_TEMPLATE = r'data-ip-id=["\'](%s)'
-        return try_get(episode, lambda x: x[key][default_key])
-
-    def _get_description(self, data):
-        synopsis = data.get(self._DESCRIPTION_KEY) or {}
-        return dict_get(synopsis, ('large', 'medium', 'small'))
-
-    def _fetch_page(self, programme_id, per_page, series_id, page):
-        elements = self._get_elements(self._call_api(
-            programme_id, per_page, page + 1, series_id))
-        for element in elements:
-            episode = self._get_episode(element)
-            episode_id = episode.get('id')
-            if not episode_id:
-                continue
-            thumbnail = None
-            image = self._get_episode_image(episode)
-            if image:
-                thumbnail = image.replace('{recipe}', 'raw')
-            category = self._get_default(episode, 'labels', 'category')
-            yield {
-                '_type': 'url',
-                'id': episode_id,
-                'title': self._get_episode_field(episode, 'subtitle'),
-                'url': 'https://www.bbc.co.uk/iplayer/episode/' + episode_id,
-                'thumbnail': thumbnail,
-                'description': self._get_description(episode),
-                'categories': [category] if category else None,
-                'series': self._get_episode_field(episode, 'title'),
-                'ie_key': BBCCoUkIE.ie_key(),
-            }
-
-    def _real_extract(self, url):
-        pid = self._match_id(url)
-        qs = compat_parse_qs(compat_urllib_parse_urlparse(url).query)
-        series_id = qs.get('seriesId', [None])[0]
-        page = qs.get('page', [None])[0]
-        per_page = 36 if page else self._PAGE_SIZE
-        fetch_page = functools.partial(self._fetch_page, pid, per_page, series_id)
-        entries = fetch_page(int(page) - 1) if page else OnDemandPagedList(fetch_page, self._PAGE_SIZE)
-        playlist_data = self._get_playlist_data(self._call_api(pid, 1))
-        return self.playlist_result(
-            entries, pid, self._get_playlist_title(playlist_data),
-            self._get_description(playlist_data))
-
-
-class BBCCoUkIPlayerEpisodesIE(BBCCoUkIPlayerPlaylistBaseIE):
-    IE_NAME = 'bbc.co.uk:iplayer:episodes'
-    _VALID_URL = BBCCoUkIPlayerPlaylistBaseIE._VALID_URL_TMPL % 'episodes'
     _TESTS = [{
         'url': 'http://www.bbc.co.uk/iplayer/episodes/b05rcz9v',
         'info_dict': {
             'id': 'b05rcz9v',
             'title': 'The Disappearance',
-            'description': 'md5:58eb101aee3116bad4da05f91179c0cb',
+            'description': 'French thriller serial about a missing teenager.',
         },
-        'playlist_mincount': 8,
+        'playlist_mincount': 6,
+        'skip': 'This programme is not currently available on BBC iPlayer',
     }, {
-        # all seasons
-        'url': 'https://www.bbc.co.uk/iplayer/episodes/b094m5t9/doctor-foster',
-        'info_dict': {
-            'id': 'b094m5t9',
-            'title': 'Doctor Foster',
-            'description': 'md5:5aa9195fad900e8e14b52acd765a9fd6',
-        },
-        'playlist_mincount': 10,
-    }, {
-        # explicit season
-        'url': 'https://www.bbc.co.uk/iplayer/episodes/b094m5t9/doctor-foster?seriesId=b094m6nv',
-        'info_dict': {
-            'id': 'b094m5t9',
-            'title': 'Doctor Foster',
-            'description': 'md5:5aa9195fad900e8e14b52acd765a9fd6',
-        },
-        'playlist_mincount': 5,
-    }, {
-        # all pages
-        'url': 'https://www.bbc.co.uk/iplayer/episodes/m0004c4v/beechgrove',
-        'info_dict': {
-            'id': 'm0004c4v',
-            'title': 'Beechgrove',
-            'description': 'Gardening show that celebrates Scottish horticulture and growing conditions.',
-        },
-        'playlist_mincount': 37,
-    }, {
-        # explicit page
-        'url': 'https://www.bbc.co.uk/iplayer/episodes/m0004c4v/beechgrove?page=2',
-        'info_dict': {
-            'id': 'm0004c4v',
-            'title': 'Beechgrove',
-            'description': 'Gardening show that celebrates Scottish horticulture and growing conditions.',
-        },
-        'playlist_mincount': 1,
-    }]
-    _PAGE_SIZE = 100
-    _DESCRIPTION_KEY = 'synopsis'
-
-    def _get_episode_image(self, episode):
-        return self._get_default(episode, 'image')
-
-    def _get_episode_field(self, episode, field):
-        return self._get_default(episode, field)
-
-    @staticmethod
-    def _get_elements(data):
-        return data['entities']['results']
-
-    @staticmethod
-    def _get_episode(element):
-        return element.get('episode') or {}
-
-    def _call_api(self, pid, per_page, page=1, series_id=None):
-        variables = {
-            'id': pid,
-            'page': page,
-            'perPage': per_page,
-        }
-        if series_id:
-            variables['sliceId'] = series_id
-        return self._download_json(
-            'https://graph.ibl.api.bbc.co.uk/', pid, headers={
-                'Content-Type': 'application/json'
-            }, data=json.dumps({
-                'id': '5692d93d5aac8d796a0305e895e61551',
-                'variables': variables,
-            }).encode('utf-8'))['data']['programme']
-
-    @staticmethod
-    def _get_playlist_data(data):
-        return data
-
-    def _get_playlist_title(self, data):
-        return self._get_default(data, 'title')
-
-
-class BBCCoUkIPlayerGroupIE(BBCCoUkIPlayerPlaylistBaseIE):
-    IE_NAME = 'bbc.co.uk:iplayer:group'
-    _VALID_URL = BBCCoUkIPlayerPlaylistBaseIE._VALID_URL_TMPL % 'group'
-    _TESTS = [{
         # Available for over a year unlike 30 days for most other programmes
         'url': 'http://www.bbc.co.uk/iplayer/group/p02tcc32',
         'info_dict': {
@@ -1494,56 +1361,14 @@ class BBCCoUkIPlayerGroupIE(BBCCoUkIPlayerPlaylistBaseIE):
             'description': 'md5:683e901041b2fe9ba596f2ab04c4dbe7',
         },
         'playlist_mincount': 10,
-    }, {
-        # all pages
-        'url': 'https://www.bbc.co.uk/iplayer/group/p081d7j7',
-        'info_dict': {
-            'id': 'p081d7j7',
-            'title': 'Music in Scotland',
-            'description': 'Perfomances in Scotland and programmes featuring Scottish acts.',
-        },
-        'playlist_mincount': 47,
-    }, {
-        # explicit page
-        'url': 'https://www.bbc.co.uk/iplayer/group/p081d7j7?page=2',
-        'info_dict': {
-            'id': 'p081d7j7',
-            'title': 'Music in Scotland',
-            'description': 'Perfomances in Scotland and programmes featuring Scottish acts.',
-        },
-        'playlist_mincount': 11,
     }]
-    _PAGE_SIZE = 200
-    _DESCRIPTION_KEY = 'synopses'
 
-    def _get_episode_image(self, episode):
+    def _extract_title_and_description(self, webpage):
-        return self._get_default(episode, 'images', 'standard')
+        title = self._search_regex(r'<h1>([^<]+)</h1>', webpage, 'title', fatal=False)
-
+        description = self._search_regex(
-    def _get_episode_field(self, episode, field):
+            r'<p[^>]+class=(["\'])subtitle\1[^>]*>(?P<value>[^<]+)</p>',
-        return episode.get(field)
+            webpage, 'description', fatal=False, group='value')
-
+        return title, description
-    @staticmethod
-    def _get_elements(data):
-        return data['elements']
-
-    @staticmethod
-    def _get_episode(element):
-        return element
-
-    def _call_api(self, pid, per_page, page=1, series_id=None):
-        return self._download_json(
-            'http://ibl.api.bbc.co.uk/ibl/v1/groups/%s/episodes' % pid,
-            pid, query={
-                'page': page,
-                'per_page': per_page,
-            })['group_episodes']
-
-    @staticmethod
-    def _get_playlist_data(data):
-        return data['group']
-
-    def _get_playlist_title(self, data):
-        return data.get('title')
 
 
 class BBCCoUkPlaylistIE(BBCCoUkPlaylistBaseIE):

youtube_dl/extractor/extractors.py

@@ -95,8 +95,7 @@ from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,
-    BBCCoUkIPlayerEpisodesIE,
+    BBCCoUkIPlayerPlaylistIE,
-    BBCCoUkIPlayerGroupIE,
     BBCCoUkPlaylistIE,
     BBCIE,
 )
@@ -1629,5 +1628,4 @@ from .zingmp3 import (
     ZingMp3IE,
     ZingMp3AlbumIE,
 )
-from .zoom import ZoomIE
 from .zype import ZypeIE

youtube_dl/extractor/generic.py

@@ -2953,7 +2953,7 @@ class GenericIE(InfoExtractor):
             webpage)
         if not mobj:
             mobj = re.search(
-                r'data-video-link=["\'](?P<url>http://m\.mlb\.com/video/[^"\']+)',
+                r'data-video-link=["\'](?P<url>http://m.mlb.com/video/[^"\']+)',
                 webpage)
         if mobj is not None:
             return self.url_result(mobj.group('url'), 'MLB')

youtube_dl/extractor/mtv.py

@@ -320,7 +320,7 @@ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor):
     @staticmethod
     def _extract_url(webpage):
         mobj = re.search(
-            r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//media\.mtvnservices\.com/embed/.+?)\1', webpage)
+            r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//media.mtvnservices.com/embed/.+?)\1', webpage)
         if mobj:
             return mobj.group('url')
 

youtube_dl/extractor/zoom.py

@@ -1,68 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    js_to_json,
-    parse_filesize,
-    urlencode_postdata,
-)
-
-
-class ZoomIE(InfoExtractor):
-    IE_NAME = 'zoom'
-    _VALID_URL = r'(?P<base_url>https?://(?:[^.]+\.)?zoom.us/)rec(?:ording)?/(?:play|share)/(?P<id>[A-Za-z0-9_.-]+)'
-    _TEST = {
-        'url': 'https://economist.zoom.us/rec/play/dUk_CNBETmZ5VA2BwEl-jjakPpJ3M1pcfVYAPRsoIbEByGsLjUZtaa4yCATQuOL3der8BlTwxQePl_j0.EImBkXzTIaPvdZO5',
-        'md5': 'ab445e8c911fddc4f9adc842c2c5d434',
-        'info_dict': {
-            'id': 'dUk_CNBETmZ5VA2BwEl-jjakPpJ3M1pcfVYAPRsoIbEByGsLjUZtaa4yCATQuOL3der8BlTwxQePl_j0.EImBkXzTIaPvdZO5',
-            'ext': 'mp4',
-            'title': 'China\'s "two sessions" and the new five-year plan',
-        }
-    }
-
-    def _real_extract(self, url):
-        base_url, play_id = re.match(self._VALID_URL, url).groups()
-        webpage = self._download_webpage(url, play_id)
-
-        try:
-            form = self._form_hidden_inputs('password_form', webpage)
-        except ExtractorError:
-            form = None
-        if form:
-            password = self._downloader.params.get('videopassword')
-            if not password:
-                raise ExtractorError(
-                    'This video is protected by a passcode, use the --video-password option', expected=True)
-            is_meeting = form.get('useWhichPasswd') == 'meeting'
-            validation = self._download_json(
-                base_url + 'rec/validate%s_passwd' % ('_meet' if is_meeting else ''),
-                play_id, 'Validating passcode', 'Wrong passcode', data=urlencode_postdata({
-                    'id': form[('meet' if is_meeting else 'file') + 'Id'],
-                    'passwd': password,
-                    'action': form.get('action'),
-                }))
-            if not validation.get('status'):
-                raise ExtractorError(validation['errorMessage'], expected=True)
-            webpage = self._download_webpage(url, play_id)
-
-        data = self._parse_json(self._search_regex(
-            r'(?s)window\.__data__\s*=\s*({.+?});',
-            webpage, 'data'), play_id, js_to_json)
-
-        return {
-            'id': play_id,
-            'title': data['topic'],
-            'url': data['viewMp4Url'],
-            'width': int_or_none(data.get('viewResolvtionsWidth')),
-            'height': int_or_none(data.get('viewResolvtionsHeight')),
-            'http_headers': {
-                'Referer': base_url,
-            },
-            'filesize_approx': parse_filesize(data.get('fileSize')),
-        }

youtube_dl/version.py

@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2021.03.25'
+__version__ = '2021.03.14'