remove vevo.py

yt_dlp/extractor/_extractors.py

@@ -2298,10 +2298,6 @@
 from .vbox7 import Vbox7IE
 from .veo import VeoIE
 from .vesti import VestiIE
-from .vevo import (
-    VevoIE,
-    VevoPlaylistIE,
-)
 from .vgtv import (
     VGTVIE,
     BTArticleIE,

yt_dlp/extractor/dailymotion.py

@@ -171,17 +171,6 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
             'view_count': int,
         },
         'skip': 'video gone',
-    }, {
-        # Vevo video
-        'url': 'http://www.dailymotion.com/video/x149uew_katy-perry-roar-official_musi',
-        'info_dict': {
-            'title': 'Roar (Official)',
-            'id': 'USUV71301934',
-            'ext': 'mp4',
-            'uploader': 'Katy Perry',
-            'upload_date': '20130905',
-        },
-        'skip': 'Invalid URL',
     }, {
         # age-restricted video
         'url': 'http://www.dailymotion.com/video/xyh2zz_leanna-decker-cyber-girl-of-the-year-desires-nude-playboy-plus_redband',

yt_dlp/extractor/disney.py

@@ -90,10 +90,6 @@ def _real_extract(self, url):
                 webpage, 'embed data'), video_id)
             video_data = page_data['video']
 
-        for external in video_data.get('externals', []):
-            if external.get('source') == 'vevo':
-                return self.url_result('vevo:' + external['data_id'], 'Vevo')
-
         video_id = video_data['id']
         title = video_data['title']
 

yt_dlp/extractor/myspace.py

@@ -111,12 +111,8 @@ def search_data(name):
                 search_data('stream-url'), search_data('hls-stream-url'),
                 search_data('http-stream-url'))
             if not formats:
-                vevo_id = search_data('vevo-id')
                 youtube_id = search_data('youtube-id')
-                if vevo_id:
+                if youtube_id:
-                    self.to_screen(f'Vevo video detected: {vevo_id}')
-                    return self.url_result(f'vevo:{vevo_id}', ie='Vevo')
-                elif youtube_id:
                     self.to_screen(f'Youtube video detected: {youtube_id}')
                     return self.url_result(youtube_id, ie='Youtube')
                 else:

yt_dlp/extractor/vevo.py

@@ -1,352 +0,0 @@
-import json
-import re
-
-from .common import InfoExtractor
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    parse_iso8601,
-    parse_qs,
-)
-
-
-class VevoBaseIE(InfoExtractor):
-    def _extract_json(self, webpage, video_id):
-        return self._parse_json(
-            self._search_regex(
-                r'window\.__INITIAL_STORE__\s*=\s*({.+?});\s*</script>',
-                webpage, 'initial store'),
-            video_id)
-
-
-class VevoIE(VevoBaseIE):
-    """
-    Accepts urls from vevo.com or in the format 'vevo:{id}'
-    (currently used by MTVIE and MySpaceIE)
-    """
-    _VALID_URL = r'''(?x)
-        (?:https?://(?:www\.)?vevo\.com/watch/(?!playlist|genre)(?:[^/]+/(?:[^/]+/)?)?|
-           https?://cache\.vevo\.com/m/html/embed\.html\?video=|
-           https?://videoplayer\.vevo\.com/embed/embedded\?videoId=|
-           https?://embed\.vevo\.com/.*?[?&]isrc=|
-           https?://tv\.vevo\.com/watch/artist/(?:[^/]+)/|
-           vevo:)
-        (?P<id>[^&?#]+)'''
-    _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:cache\.)?vevo\.com/.+?)\1']
-
-    _TESTS = [{
-        'url': 'http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280',
-        'md5': '95ee28ee45e70130e3ab02b0f579ae23',
-        'info_dict': {
-            'id': 'GB1101300280',
-            'ext': 'mp4',
-            'title': 'Hurts - Somebody to Die For',
-            'timestamp': 1372057200,
-            'upload_date': '20130624',
-            'uploader': 'Hurts',
-            'track': 'Somebody to Die For',
-            'artist': 'Hurts',
-            'genre': 'Pop',
-        },
-        'expected_warnings': ['Unable to download SMIL file', 'Unable to download info'],
-    }, {
-        'note': 'v3 SMIL format',
-        'url': 'http://www.vevo.com/watch/cassadee-pope/i-wish-i-could-break-your-heart/USUV71302923',
-        'md5': 'f6ab09b034f8c22969020b042e5ac7fc',
-        'info_dict': {
-            'id': 'USUV71302923',
-            'ext': 'mp4',
-            'title': 'Cassadee Pope - I Wish I Could Break Your Heart',
-            'timestamp': 1392796919,
-            'upload_date': '20140219',
-            'uploader': 'Cassadee Pope',
-            'track': 'I Wish I Could Break Your Heart',
-            'artist': 'Cassadee Pope',
-            'genre': 'Country',
-        },
-        'expected_warnings': ['Unable to download SMIL file', 'Unable to download info'],
-    }, {
-        'note': 'Age-limited video',
-        'url': 'https://www.vevo.com/watch/justin-timberlake/tunnel-vision-explicit/USRV81300282',
-        'info_dict': {
-            'id': 'USRV81300282',
-            'ext': 'mp4',
-            'title': 'Justin Timberlake - Tunnel Vision (Explicit)',
-            'age_limit': 18,
-            'timestamp': 1372888800,
-            'upload_date': '20130703',
-            'uploader': 'Justin Timberlake',
-            'track': 'Tunnel Vision (Explicit)',
-            'artist': 'Justin Timberlake',
-            'genre': 'Pop',
-        },
-        'expected_warnings': ['Unable to download SMIL file', 'Unable to download info'],
-    }, {
-        'note': 'No video_info',
-        'url': 'http://www.vevo.com/watch/k-camp-1/Till-I-Die/USUV71503000',
-        'md5': '8b83cc492d72fc9cf74a02acee7dc1b0',
-        'info_dict': {
-            'id': 'USUV71503000',
-            'ext': 'mp4',
-            'title': 'K Camp ft. T.I. - Till I Die',
-            'age_limit': 18,
-            'timestamp': 1449468000,
-            'upload_date': '20151207',
-            'uploader': 'K Camp',
-            'track': 'Till I Die',
-            'artist': 'K Camp',
-            'genre': 'Hip-Hop',
-        },
-        'expected_warnings': ['Unable to download SMIL file', 'Unable to download info'],
-    }, {
-        'note': 'Featured test',
-        'url': 'https://www.vevo.com/watch/lemaitre/Wait/USUV71402190',
-        'md5': 'd28675e5e8805035d949dc5cf161071d',
-        'info_dict': {
-            'id': 'USUV71402190',
-            'ext': 'mp4',
-            'title': 'Lemaitre ft. LoLo - Wait',
-            'age_limit': 0,
-            'timestamp': 1413432000,
-            'upload_date': '20141016',
-            'uploader': 'Lemaitre',
-            'track': 'Wait',
-            'artist': 'Lemaitre',
-            'genre': 'Electronic',
-        },
-        'expected_warnings': ['Unable to download SMIL file', 'Unable to download info'],
-    }, {
-        'note': 'Only available via webpage',
-        'url': 'http://www.vevo.com/watch/GBUV71600656',
-        'md5': '67e79210613865b66a47c33baa5e37fe',
-        'info_dict': {
-            'id': 'GBUV71600656',
-            'ext': 'mp4',
-            'title': 'ABC - Viva Love',
-            'age_limit': 0,
-            'timestamp': 1461830400,
-            'upload_date': '20160428',
-            'uploader': 'ABC',
-            'track': 'Viva Love',
-            'artist': 'ABC',
-            'genre': 'Pop',
-        },
-        'expected_warnings': ['Failed to download video versions info'],
-    }, {
-        # no genres available
-        'url': 'http://www.vevo.com/watch/INS171400764',
-        'only_matching': True,
-    }, {
-        # Another case available only via the webpage; using streams/streamsV3 formats
-        # Geo-restricted to Netherlands/Germany
-        'url': 'http://www.vevo.com/watch/boostee/pop-corn-clip-officiel/FR1A91600909',
-        'only_matching': True,
-    }, {
-        'url': 'https://embed.vevo.com/?isrc=USH5V1923499&partnerId=4d61b777-8023-4191-9ede-497ed6c24647&partnerAdCode=',
-        'only_matching': True,
-    }, {
-        'url': 'https://tv.vevo.com/watch/artist/janet-jackson/US0450100550',
-        'only_matching': True,
-    }]
-    _VERSIONS = {
-        0: 'youtube',  # only in AuthenticateVideo videoVersions
-        1: 'level3',
-        2: 'akamai',
-        3: 'level3',
-        4: 'amazon',
-    }
-
-    def _initialize_api(self, video_id):
-        webpage = self._download_webpage(
-            'https://accounts.vevo.com/token', None,
-            note='Retrieving oauth token',
-            errnote='Unable to retrieve oauth token',
-            data=json.dumps({
-                'client_id': 'SPupX1tvqFEopQ1YS6SS',
-                'grant_type': 'urn:vevo:params:oauth:grant-type:anonymous',
-            }).encode(),
-            headers={
-                'Content-Type': 'application/json',
-            })
-
-        if re.search(r'(?i)THIS PAGE IS CURRENTLY UNAVAILABLE IN YOUR REGION', webpage):
-            self.raise_geo_restricted(
-                f'{self.IE_NAME} said: This page is currently unavailable in your region')
-
-        auth_info = self._parse_json(webpage, video_id)
-        self._api_url_template = self.http_scheme() + '//apiv2.vevo.com/%s?token=' + auth_info['legacy_token']
-
-    def _call_api(self, path, *args, **kwargs):
-        try:
-            data = self._download_json(self._api_url_template % path, *args, **kwargs)
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError):
-                errors = self._parse_json(e.cause.response.read().decode(), None)['errors']
-                error_message = ', '.join([error['message'] for error in errors])
-                raise ExtractorError(f'{self.IE_NAME} said: {error_message}', expected=True)
-            raise
-        return data
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        self._initialize_api(video_id)
-
-        video_info = self._call_api(
-            f'video/{video_id}', video_id, 'Downloading api video info',
-            'Failed to download video info')
-
-        video_versions = self._call_api(
-            f'video/{video_id}/streams', video_id,
-            'Downloading video versions info',
-            'Failed to download video versions info',
-            fatal=False)
-
-        # Some videos are only available via webpage (e.g.
-        # https://github.com/ytdl-org/youtube-dl/issues/9366)
-        if not video_versions:
-            webpage = self._download_webpage(url, video_id)
-            json_data = self._extract_json(webpage, video_id)
-            if 'streams' in json_data.get('default', {}):
-                video_versions = json_data['default']['streams'][video_id][0]
-            else:
-                video_versions = [
-                    value
-                    for key, value in json_data['apollo']['data'].items()
-                    if key.startswith(f'{video_id}.streams')]
-
-        uploader = None
-        artist = None
-        featured_artist = None
-        artists = video_info.get('artists')
-        for curr_artist in artists:
-            if curr_artist.get('role') == 'Featured':
-                featured_artist = curr_artist['name']
-            else:
-                artist = uploader = curr_artist['name']
-
-        formats = []
-        for video_version in video_versions:
-            version = self._VERSIONS.get(video_version.get('version'), 'generic')
-            version_url = video_version.get('url')
-            if not version_url:
-                continue
-
-            if '.ism' in version_url:
-                continue
-            elif '.mpd' in version_url:
-                formats.extend(self._extract_mpd_formats(
-                    version_url, video_id, mpd_id=f'dash-{version}',
-                    note=f'Downloading {version} MPD information',
-                    errnote=f'Failed to download {version} MPD information',
-                    fatal=False))
-            elif '.m3u8' in version_url:
-                formats.extend(self._extract_m3u8_formats(
-                    version_url, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id=f'hls-{version}',
-                    note=f'Downloading {version} m3u8 information',
-                    errnote=f'Failed to download {version} m3u8 information',
-                    fatal=False))
-            else:
-                m = re.search(r'''(?xi)
-                    _(?P<quality>[a-z0-9]+)
-                    _(?P<width>[0-9]+)x(?P<height>[0-9]+)
-                    _(?P<vcodec>[a-z0-9]+)
-                    _(?P<vbr>[0-9]+)
-                    _(?P<acodec>[a-z0-9]+)
-                    _(?P<abr>[0-9]+)
-                    \.(?P<ext>[a-z0-9]+)''', version_url)
-                if not m:
-                    continue
-
-                formats.append({
-                    'url': version_url,
-                    'format_id': f'http-{version}-{video_version.get("quality") or m.group("quality")}',
-                    'vcodec': m.group('vcodec'),
-                    'acodec': m.group('acodec'),
-                    'vbr': int(m.group('vbr')),
-                    'abr': int(m.group('abr')),
-                    'ext': m.group('ext'),
-                    'width': int(m.group('width')),
-                    'height': int(m.group('height')),
-                })
-
-        track = video_info['title']
-        if featured_artist:
-            artist = f'{artist} ft. {featured_artist}'
-        title = f'{artist} - {track}' if artist else track
-
-        genres = video_info.get('genres')
-        genre = (
-            genres[0] if genres and isinstance(genres, list)
-            and isinstance(genres[0], str) else None)
-
-        is_explicit = video_info.get('isExplicit')
-        if is_explicit is True:
-            age_limit = 18
-        elif is_explicit is False:
-            age_limit = 0
-        else:
-            age_limit = None
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnail': video_info.get('imageUrl') or video_info.get('thumbnailUrl'),
-            'timestamp': parse_iso8601(video_info.get('releaseDate')),
-            'uploader': uploader,
-            'duration': int_or_none(video_info.get('duration')),
-            'view_count': int_or_none(video_info.get('views', {}).get('total')),
-            'age_limit': age_limit,
-            'track': track,
-            'artist': uploader,
-            'genre': genre,
-        }
-
-
-class VevoPlaylistIE(VevoBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?vevo\.com/watch/(?P<kind>playlist|genre)/(?P<id>[^/?#&]+)'
-
-    _TESTS = [{
-        'url': 'http://www.vevo.com/watch/genre/rock',
-        'info_dict': {
-            'id': 'rock',
-            'title': 'Rock',
-        },
-        'playlist_count': 20,
-    }, {
-        'url': 'http://www.vevo.com/watch/genre/rock?index=0',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        playlist_id = mobj.group('id')
-        playlist_kind = mobj.group('kind')
-
-        webpage = self._download_webpage(url, playlist_id)
-
-        qs = parse_qs(url)
-        index = qs.get('index', [None])[0]
-
-        if index:
-            video_id = self._search_regex(
-                r'<meta[^>]+content=(["\'])vevo://video/(?P<id>.+?)\1[^>]*>',
-                webpage, 'video id', default=None, group='id')
-            if video_id:
-                return self.url_result(f'vevo:{video_id}', VevoIE.ie_key())
-
-        playlists = self._extract_json(webpage, playlist_id)['default'][f'{playlist_kind}s']
-
-        playlist = (next(iter(playlists.values()))
-                    if playlist_kind == 'playlist' else playlists[playlist_id])
-
-        entries = [
-            self.url_result(f'vevo:{src}', VevoIE.ie_key())
-            for src in playlist['isrcs']]
-
-        return self.playlist_result(
-            entries, playlist.get('playlistId') or playlist_id,
-            playlist.get('name'), playlist.get('description'))