From 4ffc31033e5fd2bfc5a9882f14eca01382341682 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 23 Nov 2014 22:00:25 +0100 Subject: [PATCH] [zingmp3] Simplify and PEP8 (#4288) --- youtube_dl/extractor/zingmp3.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/youtube_dl/extractor/zingmp3.py b/youtube_dl/extractor/zingmp3.py index 2c2073adf..1afbe68ed 100644 --- a/youtube_dl/extractor/zingmp3.py +++ b/youtube_dl/extractor/zingmp3.py @@ -24,8 +24,6 @@ class ZingMp3BaseInfoExtractor(InfoExtractor): def _extract_player_xml(self, player_xml_url, id, playlist_title=None): player_xml = self._download_xml(player_xml_url, id, 'Downloading Player XML') - - self.report_extraction(id) items = player_xml.findall('./item') if len(items) == 1: @@ -55,12 +53,13 @@ class ZingMp3SongIE(ZingMp3BaseInfoExtractor): _VALID_URL = r'https?://mp3\.zing\.vn/bai-hat/(?P[^/]+)/(?P\w+)\.html' _TESTS = [{ 'url': 'http://mp3.zing.vn/bai-hat/Xa-Mai-Xa-Bao-Thy/ZWZB9WAB.html', + 'md5': 'ead7ae13693b3205cbc89536a077daed', 'info_dict': { 'id': 'ZWZB9WAB', - 'title': u'Xa Mãi Xa', + 'title': 'Xa Mãi Xa', 'ext': 'mp3', + 'thumbnail': 're:^https?://.*\.jpg$', }, - 'md5': 'ead7ae13693b3205cbc89536a077daed', }] IE_NAME = 'zingmp3:song' IE_DESC = 'mp3.zing.vn songs' @@ -70,9 +69,11 @@ class ZingMp3SongIE(ZingMp3BaseInfoExtractor): slug = matched.group('slug') 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[^&]+)&', webpage, 'player xml url') + player_xml_url = self._search_regex( + r'&xmlURL=(?P[^&]+)&', webpage, 'player xml url') return self._extract_player_xml(player_xml_url, song_id) @@ -84,7 +85,7 @@ class ZingMp3AlbumIE(ZingMp3BaseInfoExtractor): 'info_dict': { '_type': 'playlist', '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, }] @@ -96,8 +97,11 @@ class ZingMp3AlbumIE(ZingMp3BaseInfoExtractor): slug = matched.group('slug') 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[^&]+)&', webpage, 'player xml url') - player_xml_url = self._search_regex(r'&xmlURL=(?P[^&]+)&', webpage, 'player xml url') - - return self._extract_player_xml(player_xml_url, album_id, playlist_title=self._og_search_title(webpage)) \ No newline at end of file + return self._extract_player_xml( + player_xml_url, album_id, + playlist_title=self._og_search_title(webpage))