MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-26 05:05:54 +01:00
Code Issues Projects Releases Wiki Activity

[Zingmp3] Fix signature (#3004)

Browse Source 
Authored by: hatienl0i261299
This commit is contained in:
Ha Tien Loi 2022-03-10 13:13:19 +07:00 committed by GitHub
parent 07ff290dce
commit 63b2f88bc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
yt_dlp/extractor/zingmp3.py
View File

@ -9,7 +9,6 @@
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
traverse_obj, traverse_obj,
HEADRequest,
) )
@ -106,18 +105,17 @@ def _extract_item(self, item, song_id, type_url, fatal):
def _real_initialize(self): def _real_initialize(self):
if not self.get_param('cookiefile') and not self.get_param('cookiesfrombrowser'): if not self.get_param('cookiefile') and not self.get_param('cookiesfrombrowser'):
self._request_webpage(HEADRequest(self._DOMAIN), None, note='Updating cookies') self._request_webpage(self.get_api_with_signature(name_api=self._SLUG_API['bai-hat'], param={'id': ''}),
None, note='Updating cookies')
def _real_extract(self, url): def _real_extract(self, url):
song_id, type_url = self._match_valid_url(url).group('id', 'type') song_id, type_url = self._match_valid_url(url).group('id', 'type')
api = self.get_api_with_signature(name_api=self._SLUG_API[type_url], param={'id': song_id}) api = self.get_api_with_signature(name_api=self._SLUG_API[type_url], param={'id': song_id})
return self._process_data(self._download_json(api, song_id)['data'], song_id, type_url) return self._process_data(self._download_json(api, song_id)['data'], song_id, type_url)
def get_api_with_signature(self, name_api, param): def get_api_with_signature(self, name_api, param):
sha256 = hashlib.sha256(''.join(f'{k}={v}' for k, v in param.items()).encode('utf-8')).hexdigest() param.update({'ctime': '1'})
sha256 = hashlib.sha256(''.join(f'{i}={param[i]}' for i in sorted(param)).encode('utf-8')).hexdigest()
data = { data = {
'apiKey': self._API_KEY, 'apiKey': self._API_KEY,
'sig': hmac.new(self._SECRET_KEY, f'{name_api}{sha256}'.encode('utf-8'), hashlib.sha512).hexdigest(), 'sig': hmac.new(self._SECRET_KEY, f'{name_api}{sha256}'.encode('utf-8'), hashlib.sha512).hexdigest(),
@ -161,6 +159,20 @@ class ZingMp3IE(ZingMp3BaseIE):
'album': 'Sương Hoa Đưa Lối (Single)', 'album': 'Sương Hoa Đưa Lối (Single)',
'album_artist': 'K-ICM, RYO', 'album_artist': 'K-ICM, RYO',
}, },
}, {
'url': 'https://zingmp3.vn/bai-hat/Nguoi-Yeu-Toi-Lanh-Lung-Sat-Da-Mr-Siro/ZZ6IW7OU.html',
'md5': '3e9f7a9bd0d965573dbff8d7c68b629d',
'info_dict': {
'id': 'ZZ6IW7OU',
'title': 'Người Yêu Tôi Lạnh Lùng Sắt Đá',
'ext': 'mp3',
'thumbnail': r're:^https?://.+\.jpg',
'duration': 303,
'track': 'Người Yêu Tôi Lạnh Lùng Sắt Đá',
'artist': 'Mr. Siro',
'album': 'Người Yêu Tôi Lạnh Lùng Sắt Đá (Single)',
'album_artist': 'Mr. Siro',
},
}, { }, {
'url': 'https://zingmp3.vn/embed/song/ZWZEI76B?start=false', 'url': 'https://zingmp3.vn/embed/song/ZWZEI76B?start=false',
'only_matching': True, 'only_matching': True,
@ -185,6 +197,14 @@ class ZingMp3AlbumIE(ZingMp3BaseIE):
'title': 'Lâu Đài Tình Ái', 'title': 'Lâu Đài Tình Ái',
}, },
'playlist_count': 9, 'playlist_count': 9,
}, {
'url': 'https://zingmp3.vn/album/Nhung-Bai-Hat-Hay-Nhat-Cua-Mr-Siro-Mr-Siro/ZWZAEZZD.html',
'info_dict': {
'_type': 'playlist',
'id': 'ZWZAEZZD',
'title': 'Những Bài Hát Hay Nhất Của Mr. Siro',
},
'playlist_count': 49,
}, { }, {
'url': 'http://mp3.zing.vn/playlist/Duong-Hong-Loan-apollobee/IWCAACCB.html', 'url': 'http://mp3.zing.vn/playlist/Duong-Hong-Loan-apollobee/IWCAACCB.html',
'only_matching': True, 'only_matching': True,