mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-12-25 03:21:31 +01:00
[zingmp3] Simplify and PEP8 (#4288)
This commit is contained in:
parent
c1777d5cb3
commit
4ffc31033e
@ -24,8 +24,6 @@ class ZingMp3BaseInfoExtractor(InfoExtractor):
|
|||||||
|
|
||||||
def _extract_player_xml(self, player_xml_url, id, playlist_title=None):
|
def _extract_player_xml(self, player_xml_url, id, playlist_title=None):
|
||||||
player_xml = self._download_xml(player_xml_url, id, 'Downloading Player XML')
|
player_xml = self._download_xml(player_xml_url, id, 'Downloading Player XML')
|
||||||
|
|
||||||
self.report_extraction(id)
|
|
||||||
items = player_xml.findall('./item')
|
items = player_xml.findall('./item')
|
||||||
|
|
||||||
if len(items) == 1:
|
if len(items) == 1:
|
||||||
@ -55,12 +53,13 @@ class ZingMp3SongIE(ZingMp3BaseInfoExtractor):
|
|||||||
_VALID_URL = r'https?://mp3\.zing\.vn/bai-hat/(?P<slug>[^/]+)/(?P<song_id>\w+)\.html'
|
_VALID_URL = r'https?://mp3\.zing\.vn/bai-hat/(?P<slug>[^/]+)/(?P<song_id>\w+)\.html'
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'http://mp3.zing.vn/bai-hat/Xa-Mai-Xa-Bao-Thy/ZWZB9WAB.html',
|
'url': 'http://mp3.zing.vn/bai-hat/Xa-Mai-Xa-Bao-Thy/ZWZB9WAB.html',
|
||||||
|
'md5': 'ead7ae13693b3205cbc89536a077daed',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'ZWZB9WAB',
|
'id': 'ZWZB9WAB',
|
||||||
'title': u'Xa Mãi Xa',
|
'title': 'Xa Mãi Xa',
|
||||||
'ext': 'mp3',
|
'ext': 'mp3',
|
||||||
|
'thumbnail': 're:^https?://.*\.jpg$',
|
||||||
},
|
},
|
||||||
'md5': 'ead7ae13693b3205cbc89536a077daed',
|
|
||||||
}]
|
}]
|
||||||
IE_NAME = 'zingmp3:song'
|
IE_NAME = 'zingmp3:song'
|
||||||
IE_DESC = 'mp3.zing.vn songs'
|
IE_DESC = 'mp3.zing.vn songs'
|
||||||
@ -70,9 +69,11 @@ class ZingMp3SongIE(ZingMp3BaseInfoExtractor):
|
|||||||
slug = matched.group('slug')
|
slug = matched.group('slug')
|
||||||
song_id = matched.group('song_id')
|
song_id = matched.group('song_id')
|
||||||
|
|
||||||
webpage = self._download_webpage('http://mp3.zing.vn/bai-hat/%s/%s.html' % (slug, song_id), song_id)
|
webpage = self._download_webpage(
|
||||||
|
'http://mp3.zing.vn/bai-hat/%s/%s.html' % (slug, song_id), song_id)
|
||||||
|
|
||||||
player_xml_url = self._search_regex(r'&xmlURL=(?P<xml_url>[^&]+)&', webpage, 'player xml url')
|
player_xml_url = self._search_regex(
|
||||||
|
r'&xmlURL=(?P<xml_url>[^&]+)&', webpage, 'player xml url')
|
||||||
|
|
||||||
return self._extract_player_xml(player_xml_url, song_id)
|
return self._extract_player_xml(player_xml_url, song_id)
|
||||||
|
|
||||||
@ -84,7 +85,7 @@ class ZingMp3AlbumIE(ZingMp3BaseInfoExtractor):
|
|||||||
'info_dict': {
|
'info_dict': {
|
||||||
'_type': 'playlist',
|
'_type': 'playlist',
|
||||||
'id': 'ZWZBWDAF',
|
'id': 'ZWZBWDAF',
|
||||||
'title': u'Lâu Đài Tình Ái - Bằng Kiều ft. Minh Tuyết | Album 320 lossless',
|
'title': 'Lâu Đài Tình Ái - Bằng Kiều ft. Minh Tuyết | Album 320 lossless',
|
||||||
},
|
},
|
||||||
'playlist_count': 10,
|
'playlist_count': 10,
|
||||||
}]
|
}]
|
||||||
@ -96,8 +97,11 @@ class ZingMp3AlbumIE(ZingMp3BaseInfoExtractor):
|
|||||||
slug = matched.group('slug')
|
slug = matched.group('slug')
|
||||||
album_id = matched.group('album_id')
|
album_id = matched.group('album_id')
|
||||||
|
|
||||||
webpage = self._download_webpage('http://mp3.zing.vn/album/%s/%s.html' % (slug, album_id), album_id)
|
webpage = self._download_webpage(
|
||||||
|
'http://mp3.zing.vn/album/%s/%s.html' % (slug, album_id), album_id)
|
||||||
|
player_xml_url = self._search_regex(
|
||||||
|
r'&xmlURL=(?P<xml_url>[^&]+)&', webpage, 'player xml url')
|
||||||
|
|
||||||
player_xml_url = self._search_regex(r'&xmlURL=(?P<xml_url>[^&]+)&', webpage, 'player xml url')
|
return self._extract_player_xml(
|
||||||
|
player_xml_url, album_id,
|
||||||
return self._extract_player_xml(player_xml_url, album_id, playlist_title=self._og_search_title(webpage))
|
playlist_title=self._og_search_title(webpage))
|
||||||
|
Loading…
Reference in New Issue
Block a user