From 63f4c5bb9c12c3d8dc48bd15c851230e7bd6e0d7 Mon Sep 17 00:00:00 2001 From: "St.Huang" Date: Fri, 10 Aug 2018 00:46:14 +0800 Subject: [PATCH] bug fixes --- addons/fastwq/service/dict/baidu_chinese.py | 16 +++------------- addons21/fastwq/service/dict/baidu_chinese.py | 16 +++------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/addons/fastwq/service/dict/baidu_chinese.py b/addons/fastwq/service/dict/baidu_chinese.py index 0426fa0..3b0ed2a 100644 --- a/addons/fastwq/service/dict/baidu_chinese.py +++ b/addons/fastwq/service/dict/baidu_chinese.py @@ -10,7 +10,7 @@ class Baidu_Chinese(WebService): def __init__(self): super(Baidu_Chinese, self).__init__() - def _get_content(self): + def _get_from_api(self): url = u"http://dict.baidu.com/s?wd={}#basicmean".format(self.quote_word) html = self.get_response(url, timeout=10) soup = parse_html(html) @@ -56,9 +56,6 @@ class Baidu_Chinese(WebService): return self.cache_this(result) - def _get_field(self, key, default=u''): - return self.cache_result(key) if self.cached(key) else self._get_content().get(key, default) - @with_styles(need_wrap_css=True, cssfile='_baidu.css') def _css(self, val): return val @@ -72,15 +69,8 @@ class Baidu_Chinese(WebService): audio_url = self._get_field('audio_url') if baidu_download_mp3 and audio_url: filename = get_hex_name(self.unique.lower(), audio_url, 'mp3') - try: - if os.path.exists(filename) or self.net_download( - filename, - audio_url, - require=dict(mime='audio/mp3', size=512) - ): - return self.get_anki_label(filename, 'audio') - except: - pass + if os.path.exists(filename) or self.download(audio_url, filename): + return self.get_anki_label(filename, 'audio') return '' @export([u'基本释义', u'Basic Definitions']) diff --git a/addons21/fastwq/service/dict/baidu_chinese.py b/addons21/fastwq/service/dict/baidu_chinese.py index d8deb6d..d96d230 100644 --- a/addons21/fastwq/service/dict/baidu_chinese.py +++ b/addons21/fastwq/service/dict/baidu_chinese.py @@ -10,7 +10,7 @@ class Baidu_Chinese(WebService): def __init__(self): super(Baidu_Chinese, self).__init__() - def _get_content(self): + def _get_from_api(self): url = u"http://dict.baidu.com/s?wd={}#basicmean".format(self.quote_word) html = self.get_response(url, timeout=10) soup = parse_html(html) @@ -56,9 +56,6 @@ class Baidu_Chinese(WebService): return self.cache_this(result) - def _get_field(self, key, default=u''): - return self.cache_result(key) if self.cached(key) else self._get_content().get(key, default) - @with_styles(need_wrap_css=True, cssfile='_baidu.css') def _css(self, val): return val @@ -72,15 +69,8 @@ class Baidu_Chinese(WebService): audio_url = self._get_field('audio_url') if baidu_download_mp3 and audio_url: filename = get_hex_name(self.unique.lower(), audio_url, 'mp3') - try: - if os.path.exists(filename) or self.net_download( - filename, - audio_url, - require=dict(mime='audio/mp3', size=512) - ): - return self.get_anki_label(filename, 'audio') - except: - pass + if os.path.exists(filename) or self.download(audio_url, filename): + return self.get_anki_label(filename, 'audio') return '' @export([u'基本释义', u'Basic Definitions'])