Revert "[yandexmusic] Add support for multi disk albums and extract t…

…rack number and disk number (closes #21420) (#21421)"

This reverts commit 7904ee5.

youtube_dl/extractor/yandexmusic.py

@@ -51,43 +51,23 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
     IE_DESC = 'Яндекс.Музыка - Трек'
     _VALID_URL = r'https?://music\.yandex\.(?:ru|kz|ua|by)/album/(?P<album_id>\d+)/track/(?P<id>\d+)'
 
-    _TESTS = [{
+    _TEST = {
         'url': 'http://music.yandex.ru/album/540508/track/4878838',
         'md5': 'f496818aa2f60b6c0062980d2e00dc20',
         'info_dict': {
             'id': '4878838',
             'ext': 'mp3',
-            'title': 'Carlo Ambrosio & Fabio Di Bari - Gypsy Eyes 1',
+            'title': 'Carlo Ambrosio, Carlo Ambrosio & Fabio Di Bari - Gypsy Eyes 1',
             'filesize': 4628061,
             'duration': 193.04,
             'track': 'Gypsy Eyes 1',
             'album': 'Gypsy Soul',
             'album_artist': 'Carlo Ambrosio',
-            'artist': 'Carlo Ambrosio & Fabio Di Bari',
+            'artist': 'Carlo Ambrosio, Carlo Ambrosio & Fabio Di Bari',
             'release_year': 2009,
         },
         'skip': 'Travis CI servers blocked by YandexMusic',
-    }, {
-        # multiple disks
-        'url': 'http://music.yandex.ru/album/3840501/track/705105',
-        'md5': 'ebe7b4e2ac7ac03fe11c19727ca6153e',
-        'info_dict': {
-            'id': '705105',
-            'ext': 'mp3',
-            'title': 'Hooverphonic - Sometimes',
-            'filesize': 5743386,
-            'duration': 239.27,
-            'track': 'Sometimes',
-            'album': 'The Best of Hooverphonic',
-            'album_artist': 'Hooverphonic',
-            'artist': 'Hooverphonic',
-            'release_year': 2016,
-            'genre': 'pop',
-            'disc_number': 2,
-            'track_number': 9,
-        },
-        'skip': 'Travis CI servers blocked by YandexMusic',
-    }]
+    }
 
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
@@ -130,21 +110,9 @@ def _real_extract(self, url):
             'abr': int_or_none(download_data.get('bitrate')),
         }
 
-        def extract_artist_name(artist):
-            decomposed = artist.get('decomposed')
-            if not isinstance(decomposed, list):
-                return artist['name']
-            parts = [artist['name']]
-            for element in decomposed:
-                if isinstance(element, dict) and element.get('name'):
-                    parts.append(element['name'])
-                elif isinstance(element, compat_str):
-                    parts.append(element)
-            return ''.join(parts)
-
         def extract_artist(artist_list):
             if artist_list and isinstance(artist_list, list):
-                artists_names = [extract_artist_name(a) for a in artist_list if a.get('name')]
+                artists_names = [a['name'] for a in artist_list if a.get('name')]
                 if artists_names:
                     return ', '.join(artists_names)
 
@@ -153,17 +121,10 @@ def extract_artist(artist_list):
             album = albums[0]
             if isinstance(album, dict):
                 year = album.get('year')
-                disc_number = int_or_none(try_get(
-                    album, lambda x: x['trackPosition']['volume']))
-                track_number = int_or_none(try_get(
-                    album, lambda x: x['trackPosition']['index']))
                 track_info.update({
                     'album': album.get('title'),
                     'album_artist': extract_artist(album.get('artists')),
                     'release_year': int_or_none(year),
-                    'genre': album.get('genre'),
-                    'disc_number': disc_number,
-                    'track_number': track_number,
                 })
 
         track_artist = extract_artist(track.get('artists'))
@@ -191,23 +152,15 @@ class YandexMusicAlbumIE(YandexMusicPlaylistBaseIE):
     IE_DESC = 'Яндекс.Музыка - Альбом'
     _VALID_URL = r'https?://music\.yandex\.(?:ru|kz|ua|by)/album/(?P<id>\d+)/?(\?|$)'
 
-    _TESTS = [{
+    _TEST = {
         'url': 'http://music.yandex.ru/album/540508',
         'info_dict': {
             'id': '540508',
             'title': 'Carlo Ambrosio - Gypsy Soul (2009)',
         },
         'playlist_count': 50,
         'skip': 'Travis CI servers blocked by YandexMusic',
-    }, {
-        'url': 'https://music.yandex.ru/album/3840501',
-        'info_dict': {
-            'id': '3840501',
-            'title': 'Hooverphonic - The Best of Hooverphonic (2016)',
-        },
-        'playlist_count': 33,
-        'skip': 'Travis CI servers blocked by YandexMusic',
-    }]
+    }
 
     def _real_extract(self, url):
         album_id = self._match_id(url)
@@ -216,7 +169,7 @@ def _real_extract(self, url):
             'http://music.yandex.ru/handlers/album.jsx?album=%s' % album_id,
             album_id, 'Downloading album JSON')
 
-        entries = self._build_playlist([track for volume in album['volumes'] for track in volume])
+        entries = self._build_playlist(album['volumes'][0])
 
         title = '%s - %s' % (album['artists'][0]['name'], album['title'])
         year = album.get('year')