From: Yen Chi Hsuan Date: Fri, 10 Jul 2015 16:03:49 +0000 (+0800) Subject: [kuwo:song] Give warnings for unavailable optional fields X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=094790d2c963ef7ee9f5861e0458174ddd15ed87;p=youtube-dl [kuwo:song] Give warnings for unavailable optional fields --- diff --git a/youtube_dl/extractor/kuwo.py b/youtube_dl/extractor/kuwo.py index 18bf66404..a021f3cdf 100644 --- a/youtube_dl/extractor/kuwo.py +++ b/youtube_dl/extractor/kuwo.py @@ -80,7 +80,7 @@ class KuwoIE(KuwoBaseIE): r']+title="([^"]+)">', webpage, 'song name') singer_name = self._html_search_regex( r']+class="s_img">\s*]+title="([^>]+)"', - webpage, 'singer name', default=None) + webpage, 'singer name', fatal=False) lrc_content = clean_html(get_element_by_id('lrcContent', webpage)) if lrc_content == '暂无': # indicates no lyrics lrc_content = None @@ -89,7 +89,7 @@ class KuwoIE(KuwoBaseIE): album_id = self._html_search_regex( r']+class="album"[^<]+]+href="http://www\.kuwo\.cn/album/(\d+)/"', - webpage, 'album id', default=None, fatal=False) + webpage, 'album id', fatal=False) publish_time = None if album_id is not None: @@ -100,7 +100,7 @@ class KuwoIE(KuwoBaseIE): publish_time = self._html_search_regex( r'发行时间:(\d{4}-\d{2}-\d{2})', album_info_page, - 'publish time', default=None) + 'publish time', fatal=False) if publish_time: publish_time = publish_time.replace('-', '')