Upgrade yt_dlp and download script
This commit is contained in:
@@ -8,20 +8,20 @@ from ..utils import (
|
||||
|
||||
|
||||
class MusicdexBaseIE(InfoExtractor):
|
||||
def _return_info(self, track_json, album_json, id):
|
||||
def _return_info(self, track_json, album_json, video_id):
|
||||
return {
|
||||
'id': str(id),
|
||||
'id': str(video_id),
|
||||
'title': track_json.get('name'),
|
||||
'track': track_json.get('name'),
|
||||
'description': track_json.get('description'),
|
||||
'track_number': track_json.get('number'),
|
||||
'url': format_field(track_json, 'url', 'https://www.musicdex.org/%s'),
|
||||
'duration': track_json.get('duration'),
|
||||
'genre': [genre.get('name') for genre in track_json.get('genres') or []],
|
||||
'genres': [genre.get('name') for genre in track_json.get('genres') or []],
|
||||
'like_count': track_json.get('likes_count'),
|
||||
'view_count': track_json.get('plays'),
|
||||
'artist': [artist.get('name') for artist in track_json.get('artists') or []],
|
||||
'album_artist': [artist.get('name') for artist in album_json.get('artists') or []],
|
||||
'artists': [artist.get('name') for artist in track_json.get('artists') or []],
|
||||
'album_artists': [artist.get('name') for artist in album_json.get('artists') or []],
|
||||
'thumbnail': format_field(album_json, 'image', 'https://www.musicdex.org/%s'),
|
||||
'album': album_json.get('name'),
|
||||
'release_year': try_get(album_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),
|
||||
@@ -43,22 +43,23 @@ class MusicdexSongIE(MusicdexBaseIE):
|
||||
'track': 'dual existence',
|
||||
'track_number': 1,
|
||||
'duration': 266000,
|
||||
'genre': ['Anime'],
|
||||
'genres': ['Anime'],
|
||||
'like_count': int,
|
||||
'view_count': int,
|
||||
'artist': ['fripSide'],
|
||||
'album_artist': ['fripSide'],
|
||||
'artists': ['fripSide'],
|
||||
'album_artists': ['fripSide'],
|
||||
'thumbnail': 'https://www.musicdex.org/storage/album/9iDIam1DHTVqUG4UclFIEq1WAFGXfPW4y0TtZa91.png',
|
||||
'album': 'To Aru Kagaku no Railgun T OP2 Single - dual existence',
|
||||
'release_year': 2020
|
||||
'release_year': 2020,
|
||||
},
|
||||
'params': {'skip_download': True}
|
||||
'params': {'skip_download': True},
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
id = self._match_id(url)
|
||||
data_json = self._download_json(f'https://www.musicdex.org/secure/tracks/{id}?defaultRelations=true', id)['track']
|
||||
return self._return_info(data_json, data_json.get('album') or {}, id)
|
||||
video_id = self._match_id(url)
|
||||
data_json = self._download_json(
|
||||
f'https://www.musicdex.org/secure/tracks/{video_id}?defaultRelations=true', video_id)['track']
|
||||
return self._return_info(data_json, data_json.get('album') or {}, video_id)
|
||||
|
||||
|
||||
class MusicdexAlbumIE(MusicdexBaseIE):
|
||||
@@ -69,9 +70,9 @@ class MusicdexAlbumIE(MusicdexBaseIE):
|
||||
'playlist_mincount': 28,
|
||||
'info_dict': {
|
||||
'id': '56',
|
||||
'genre': ['OST'],
|
||||
'genres': ['OST'],
|
||||
'view_count': int,
|
||||
'artist': ['TENMON & Eiichiro Yanagi / minori'],
|
||||
'artists': ['TENMON & Eiichiro Yanagi / minori'],
|
||||
'title': 'ef - a tale of memories Original Soundtrack 2 ~fortissimo~',
|
||||
'release_year': 2008,
|
||||
'thumbnail': 'https://www.musicdex.org/storage/album/2rSHkyYBYfB7sbvElpEyTMcUn6toY7AohOgJuDlE.jpg',
|
||||
@@ -79,18 +80,20 @@ class MusicdexAlbumIE(MusicdexBaseIE):
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
id = self._match_id(url)
|
||||
data_json = self._download_json(f'https://www.musicdex.org/secure/albums/{id}?defaultRelations=true', id)['album']
|
||||
entries = [self._return_info(track, data_json, track['id']) for track in data_json.get('tracks') or [] if track.get('id')]
|
||||
playlist_id = self._match_id(url)
|
||||
data_json = self._download_json(
|
||||
f'https://www.musicdex.org/secure/albums/{playlist_id}?defaultRelations=true', playlist_id)['album']
|
||||
entries = [self._return_info(track, data_json, track['id'])
|
||||
for track in data_json.get('tracks') or [] if track.get('id')]
|
||||
|
||||
return {
|
||||
'_type': 'playlist',
|
||||
'id': id,
|
||||
'id': playlist_id,
|
||||
'title': data_json.get('name'),
|
||||
'description': data_json.get('description'),
|
||||
'genre': [genre.get('name') for genre in data_json.get('genres') or []],
|
||||
'genres': [genre.get('name') for genre in data_json.get('genres') or []],
|
||||
'view_count': data_json.get('plays'),
|
||||
'artist': [artist.get('name') for artist in data_json.get('artists') or []],
|
||||
'artists': [artist.get('name') for artist in data_json.get('artists') or []],
|
||||
'thumbnail': format_field(data_json, 'image', 'https://www.musicdex.org/%s'),
|
||||
'release_year': try_get(data_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),
|
||||
'entries': entries,
|
||||
@@ -98,12 +101,11 @@ class MusicdexAlbumIE(MusicdexBaseIE):
|
||||
|
||||
|
||||
class MusicdexPageIE(MusicdexBaseIE): # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor
|
||||
def _entries(self, id):
|
||||
next_page_url = self._API_URL % id
|
||||
def _entries(self, playlist_id):
|
||||
next_page_url = self._API_URL % playlist_id
|
||||
while next_page_url:
|
||||
data_json = self._download_json(next_page_url, id)['pagination']
|
||||
for data in data_json.get('data') or []:
|
||||
yield data
|
||||
data_json = self._download_json(next_page_url, playlist_id)['pagination']
|
||||
yield from data_json.get('data') or []
|
||||
next_page_url = data_json.get('next_page_url')
|
||||
|
||||
|
||||
@@ -123,15 +125,15 @@ class MusicdexArtistIE(MusicdexPageIE):
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
id = self._match_id(url)
|
||||
data_json = self._download_json(f'https://www.musicdex.org/secure/artists/{id}', id)['artist']
|
||||
playlist_id = self._match_id(url)
|
||||
data_json = self._download_json(f'https://www.musicdex.org/secure/artists/{playlist_id}', playlist_id)['artist']
|
||||
entries = []
|
||||
for album in self._entries(id):
|
||||
for album in self._entries(playlist_id):
|
||||
entries.extend(self._return_info(track, album, track['id']) for track in album.get('tracks') or [] if track.get('id'))
|
||||
|
||||
return {
|
||||
'_type': 'playlist',
|
||||
'id': id,
|
||||
'id': playlist_id,
|
||||
'title': data_json.get('name'),
|
||||
'view_count': data_json.get('plays'),
|
||||
'thumbnail': format_field(data_json, 'image_small', 'https://www.musicdex.org/%s'),
|
||||
@@ -156,14 +158,14 @@ class MusicdexPlaylistIE(MusicdexPageIE):
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
id = self._match_id(url)
|
||||
data_json = self._download_json(f'https://www.musicdex.org/secure/playlists/{id}', id)['playlist']
|
||||
playlist_id = self._match_id(url)
|
||||
data_json = self._download_json(f'https://www.musicdex.org/secure/playlists/{playlist_id}', playlist_id)['playlist']
|
||||
entries = [self._return_info(track, track.get('album') or {}, track['id'])
|
||||
for track in self._entries(id) or [] if track.get('id')]
|
||||
for track in self._entries(playlist_id) or [] if track.get('id')]
|
||||
|
||||
return {
|
||||
'_type': 'playlist',
|
||||
'id': id,
|
||||
'id': playlist_id,
|
||||
'title': data_json.get('name'),
|
||||
'description': data_json.get('description'),
|
||||
'view_count': data_json.get('plays'),
|
||||
|
Reference in New Issue
Block a user