Adapt to anki 2.1

Author: sth2018

addons/fastwq/service/base.py

@@ -33,6 +33,7 @@
 from collections import defaultdict
 from functools import wraps
 from hashlib import md5
+from hashlib import sha1
 
 import cookielib
 from aqt import mw
@@ -50,19 +51,37 @@
 
 
 __all__ = [
-    'register', 'export', 'copy_static_file', 'with_styles', 'parse_html', 'service_wrap',
+    'register', 'export', 'copy_static_file', 'with_styles', 'parse_html', 'service_wrap', 'get_hex_name',
     'Service', 'WebService', 'LocalService', 'MdxService', 'StardictService', 'QueryResult'
 ]
 
 
+def get_hex_name(prefix, val, suffix):
+    ''' get sha1 hax name '''
+    hex_digest = sha1(
+        val.encode('utf-8') if isinstance(val, unicode)
+        else val
+    ).hexdigest().lower()
+    name = '.'.join([
+            '-'.join([
+                prefix, hex_digest[:8], hex_digest[8:16],
+                hex_digest[16:24], hex_digest[24:32], hex_digest[32:],
+            ]),
+            suffix,
+        ])
+    return name
+
+def _is_method_or_func(object):
+    return inspect.isfunction(object) or inspect.ismethod(object)
+
 def register(labels):
     """
     register the dict service with a labels, which will be shown in the dicts list.
     """
     def _deco(cls):
         cls.__register_label__ = _cl(labels)
 
-        methods = inspect.getmembers(cls, predicate=inspect.ismethod)
+        methods = inspect.getmembers(cls, predicate=_is_method_or_func)
         exports = []
         for method in methods:
             attrs = getattr(method[1], '__export_attrs__', None)
@@ -198,10 +217,16 @@ def cache_this(self, result):
         return result
 
     def cached(self, key):
-        return (self.word in self.cache) and self.cache[self.word].has_key(key)
+        return (self.word in self.cache) and (key in self.cache[self.word])
 
     def cache_result(self, key):
         return self.cache[self.word].get(key, u'')
+    
+    def _get_from_api(self):
+        return {}
+
+    def _get_field(self, key, default=u''):
+        return self.cache_result(key) if self.cached(key) else self._get_from_api().get(key, default)
 
     @property
     def unique(self):
@@ -210,6 +235,13 @@ def unique(self):
     @unique.setter
     def unique(self, value):
         self._unique = value
+    
+    @property
+    def quote_word(self):
+        return urllib2.quote(
+            self.word.encode('utf-8') if isinstance(self.word, unicode)
+            else self.word
+        )
 
     @property
     def support(self):
@@ -269,8 +301,10 @@ def title(self):
         return getattr(self, '__register_label__', self.unique)
 
     def get_response(self, url, data=None, headers=None, timeout=10):
-        default_headers = {'User-Agent': 'Anki WordQuery',
-                           'Accept-Encoding': 'gzip'}
+        default_headers = {
+            'User-Agent': 'Mozilla/5.0',
+            'Accept-Encoding': 'gzip'
+        }
         if headers:
             default_headers.update(headers)
 
@@ -282,7 +316,7 @@ def get_response(self, url, data=None, headers=None, timeout=10):
                 data = zlib.decompress(data, 16 + zlib.MAX_WBITS)
             return data
         except:
-            return ''
+            return u''
 
     @classmethod
     def download(cls, url, filename, timeout=15):

addons/fastwq/service/dict/LDOCE6.py

@@ -1,7 +1,7 @@
 #-*- coding:utf-8 -*-
 import re
 import FastWQ
-from ..base import MdxService, export, register, with_styles, parse_html
+from ..base import *
 
 PATH = FastWQ.LDOCE6_PATH
 
@@ -33,24 +33,11 @@ def fld_phonetic(self):
 
     def _fld_voice(self, html, voice):
         """获取发音字段"""
-        from hashlib import sha1
         for regexp in LANG_TO_REGEXPS[voice]:
             match = regexp.search(html)
             if match:
                 val = '/' + match.group(1)
-                hex_digest = sha1(
-                    val.encode('utf-8') if isinstance(val, unicode)
-                    else val
-                ).hexdigest().lower()
-
-                assert len(hex_digest) == 40, "unexpected output from hash library"
-                name = '.'.join([
-                        '-'.join([
-                            'mdx', self.unique.lower(), hex_digest[:8], hex_digest[8:16],
-                            hex_digest[16:24], hex_digest[24:32], hex_digest[32:],
-                        ]),
-                        'mp3',
-                    ])
+                name = get_hex_name('mdx-'+self.unique.lower(), val, 'mp3')
                 name = self.save_file(val, name)
                 if name:
                     return self.get_anki_label(name, 'audio')

addons/fastwq/service/dict/baicizhan.py

@@ -2,7 +2,7 @@
 import json
 import os
 from collections import defaultdict
-from ..base import WebService, export, register
+from ..base import *
 
 
 @register([u'百词斩', u'Baicizhan'])
@@ -15,8 +15,7 @@ def __init__(self):
         super(Baicizhan, self).__init__()
 
     def _get_from_api(self):
-        word = self.word.replace(' ', '_')
-        url = u"http://mall.baicizhan.com/ws/search?w={}".format(word)
+        url = u"http://mall.baicizhan.com/ws/search?w={}".format(self.quote_word)
         result = {
             "accent": u"",
             "img": u"",
@@ -33,18 +32,14 @@ def _get_from_api(self):
         except:
             pass
         return self.cache_this(result)
-    
-    def _get_field(self, key, default=u''):
-        return self.cache_result(key) if self.cached(key) else self._get_from_api().get(key, default)
 
     @export('PRON')
     def fld_phonetic(self):
-        word = self.word.replace(' ', '_')
-        url = u'http://baicizhan.qiniucdn.com/word_audios/{}.mp3'.format(word)
+        url = u'http://baicizhan.qiniucdn.com/word_audios/{}.mp3'.format(self.quote_word)
         audio_name = 'bcz_%s.mp3' % self.word
+        audio_name = get_hex_name(self.unique.lower(), audio_name, 'mp3')
         if self.bcz_download_mp3:
             if os.path.exists(audio_name) or self.download(url, audio_name, 5):
-                # urllib.urlretrieve(url, audio_name)
                 with open(audio_name, 'rb') as f:
                     if f.read().strip() == '{"error":"Document not found"}':
                         res = ''

addons/fastwq/service/dict/baidu_chinese.py

@@ -1,6 +1,6 @@
 #-*- coding:utf-8 -*-
-from hashlib import sha1
-from ..base import WebService, export, register, with_styles, parse_html
+import os
+from ..base import *
 
 baidu_download_mp3 = True
 
@@ -11,7 +11,7 @@ def __init__(self):
         super(Baidu_Chinese, self).__init__()
 
     def _get_content(self):
-        url = u"http://dict.baidu.com/s?wd={}#basicmean".format(self.word)
+        url = u"http://dict.baidu.com/s?wd={}#basicmean".format(self.quote_word)
         html = self.get_response(url, timeout=10)
         soup = parse_html(html)
         result = {
@@ -72,26 +72,14 @@ def fld_pron(self):
         audio_url = self._get_field('audio_url')
         if baidu_download_mp3 and audio_url:
             filename = u'_baidu_chinese_{}_.mp3'.format(self.word)
-            hex_digest = sha1(
-                self.word.encode('utf-8') if isinstance(self.word, unicode)
-                else self.word
-            ).hexdigest().lower()
-            assert len(hex_digest) == 40, "unexpected output from hash library"
-            filename = '.'.join([
-                '-'.join([
-                    self.unique.lower(
-                    ), hex_digest[:8], hex_digest[8:16],
-                    hex_digest[16:24], hex_digest[24:32], hex_digest[32:],
-                ]),
-                'mp3',
-            ])
+            filename = get_hex_name(self.unique.lower(), filename, 'mp3')
             try:
-                self.net_download(
+                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')
+                    require=dict(mime='audio/mp3', size=512)
+                ):
+                    return self.get_anki_label(filename, 'audio')
             except:
                 pass
         return ''

addons/fastwq/service/dict/bing.py

@@ -1,6 +1,7 @@
 #-*- coding:utf-8 -*-
 import re
-from ..base import WebService, export, register, with_styles, parse_html
+import os
+from ..base import *
 
 bing_download_mp3 = True
 
@@ -10,9 +11,8 @@ class Bing(WebService):
     def __init__(self):
         super(Bing, self).__init__()
 
-    def _get_content(self):
-        word = self.word.replace(' ', '_')
-        data = self.get_response(u"http://cn.bing.com/dict/search?q={}&mkt=zh-cn".format(word))
+    def _get_from_api(self):
+        data = self.get_response(u"http://cn.bing.com/dict/search?q={}&mkt=zh-cn".format(self.quote_word))
         soup = parse_html(data)
         result = {
             'pronunciation': {'AmE': '', 'BrE': '', 'AmEmp3': '', 'BrEmp3': ''},
@@ -66,9 +66,6 @@ def _get_content(self):
 
         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(css='.pos{font-weight:bold;margin-right:4px;}', need_wrap_css=True, wrap_class='bing')
     def _css(self, val):
         return val
@@ -86,8 +83,8 @@ def fld_phonetic_uk(self):
     def _fld_mp3(self, fld):
         audio_url = self._get_field('pronunciation')[fld]
         if bing_download_mp3 and audio_url:
-            filename = u'bing_' + u''.join(re.findall(r'\w*\.mp3', audio_url))
-            if filename and self.net_download(filename, audio_url):
+            filename = get_hex_name('bing', audio_url, 'mp3')
+            if os.path.exists(filename) or self.net_download(filename, audio_url):
                 return self.get_anki_label(filename, 'audio')
         return ''
 

addons/fastwq/service/dict/bing3tp.py

@@ -1,7 +1,8 @@
 #-*- coding:utf-8 -*-
 import json
 import re
-from ..base import WebService, export, register, with_styles
+import os
+from ..base import *
 
 bing_download_mp3 = True
 
@@ -11,7 +12,7 @@ class BingXtk(WebService):
     def __init__(self):
         super(BingXtk, self).__init__()
 
-    def _get_content(self):
+    def _get_from_api(self):
         result = {
             'pronunciation': {'AmE': '', 'BrE': '', 'AmEmp3': '', 'BrEmp3': ''},
             'def': '',
@@ -21,17 +22,13 @@ def _get_content(self):
             'Accept-Language': 'en-US,zh-CN;q=0.8,zh;q=0.6,en;q=0.4',
             'User-Agent': 'WordQuery Addon (Anki)',
             'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8'}
-        word = self.word.replace(' ', '_').encode('utf-8')
-        url = u'http://xtk.azurewebsites.net/BingDictService.aspx?Word={}'.format(word)
+        url = u'http://xtk.azurewebsites.net/BingDictService.aspx?Word={}'.format(self.quote_word)
         try:
             result.update(json.loads(self.get_response(url, headers=headers, timeout=10)))
         except:
             pass
         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)
-
     @export('AME_PHON')
     def fld_phonetic_us(self):
         seg = self._get_field('pronunciation')
@@ -45,8 +42,8 @@ def fld_phonetic_uk(self):
     def _fld_mp3(self, fld):
         audio_url = self._get_field('pronunciation')[fld]
         if bing_download_mp3 and audio_url:
-            filename = u'bing_' + u''.join(re.findall(r'\w*\.mp3', audio_url))
-            if filename and self.net_download(filename, audio_url):
+            filename = get_hex_name('bing', audio_url, 'mp3')
+            if os.path.exists(filename) or self.net_download(filename, audio_url):
                 return self.get_anki_label(filename, 'audio')
         return ''
 

addons/fastwq/service/dict/cambridge.py

@@ -1,6 +1,6 @@
 #-*- coding:utf-8 -*-
-from hashlib import sha1
-from ..base import WebService, export, register, with_styles, parse_html
+import os
+from ..base import *
 
 cambridge_download_mp3 = True
 
@@ -10,9 +10,8 @@ class Cambridge(WebService):
     def __init__(self):
         super(Cambridge, self).__init__()
 
-    def _get_content(self):
-        word = self.word.replace(' ', '_')
-        data = self.get_response(u"https://dictionary.cambridge.org/dictionary/english/{}".format(word))
+    def _get_from_api(self):
+        data = self.get_response(u"https://dictionary.cambridge.org/dictionary/english/{}".format(self.quote_word))
         soup = parse_html(data)
         result = {
             'pronunciation': {'AmE': '', 'BrE': '', 'AmEmp3': '', 'BrEmp3': ''},
@@ -29,7 +28,8 @@ def _get_content(self):
                 tags = header.find_all('span', class_='pron-info')
                 if tags:
                     for tag in tags:
-                        reg = str(tag.find('span', class_='region').get_text()).decode('utf-8')
+                        r = tag.find('span', class_='region')
+                        reg = str(r.get_text()).decode('utf-8') if r else u''
                         pn = 'AmE' if reg=='us' else 'BrE'
                         p = tag.find('span', class_='pron')
                         result['pronunciation'][pn] = str(p.get_text()).decode('utf-8') if p else u''
@@ -58,9 +58,6 @@ def _get_content(self):
                     result['def'] = u'<ul>' + u''.join(s for s in l) + u'</ul>'
 
         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='_cambridge.css')
     def _css(self, val):
@@ -79,22 +76,8 @@ def fld_phonetic_uk(self):
     def _fld_mp3(self, fld):
         audio_url = self._get_field('pronunciation')[fld]
         if cambridge_download_mp3 and audio_url:
-            filename = u'_cambridge_{}_.mp3'.format(self.word)
-            hex_digest = sha1(
-                self.word.encode('utf-8') if isinstance(self.word, unicode)
-                else self.word
-            ).hexdigest().lower()
-            assert len(hex_digest) == 40, "unexpected output from hash library"
-            filename = '.'.join([
-                '-'.join([
-                    self.unique.lower(
-                    ), hex_digest[:8], hex_digest[8:16],
-                    hex_digest[16:24], hex_digest[24:32], hex_digest[32:],
-                ]),
-                'mp3',
-            ])
-
-            if filename and self.net_download(filename, audio_url):
+            filename = get_hex_name(self.unique.lower(), audio_url, 'mp3')
+            if os.path.exists(filename) or self.net_download(filename, audio_url):
                 return self.get_anki_label(filename, 'audio')
         return ''