From 80831afef4478fd867fbed4395729dcb7985cca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=B5=20V=C4=83n=20Khoa?= Date: Sun, 1 Oct 2017 20:03:06 +0700 Subject: [PATCH] [zingmp3] update --- youtube_dl/extractor/zingmp3.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/youtube_dl/extractor/zingmp3.py b/youtube_dl/extractor/zingmp3.py index 149326b7d..b5060c72e 100644 --- a/youtube_dl/extractor/zingmp3.py +++ b/youtube_dl/extractor/zingmp3.py @@ -10,7 +10,6 @@ from ..utils import ( update_url_query, ) - class ZingMp3BaseInfoExtractor(InfoExtractor): def _extract_item(self, item, page_type, fatal=True): @@ -59,11 +58,6 @@ class ZingMp3BaseInfoExtractor(InfoExtractor): def _extract_player_json(self, player_json_url, id, page_type, playlist_title=None): player_json = self._download_json(player_json_url, id, 'Downloading Player JSON') - ''' if page_type == 'audio' or page_type == 'video': - items = player_json['data']['source'] - else: - items = player_json['data']['items'] - ''' items = player_json['data'] if 'items' in items: items = items['items'] @@ -136,8 +130,7 @@ class ZingMp3IE(ZingMp3BaseInfoExtractor): r'&xmlURL=([^&]+)&' ], webpage, 'player xml url') - #playlist_title = self._html_search_regex(r'

([^>]+)

', webpage, 'title') playlist_title = self._og_search_title(webpage) - page_type = self._search_regex(r'type=([^&]+)', player_json_url, 'page type') + page_type = self._search_regex(r'type=([^&]+)', player_json_url, 'page type', fatal=False, default='audio') return self._extract_player_json(player_json_url, page_id, page_type, playlist_title)