.*?', html, re.DOTALL)
return QueryResult(result=html, js=u'\n'.join(js))
def _get_definition_mdx(self):
- """根据关键字得到MDX词典的解释"""
+ """according to the word return mdx dictionary page"""
content = self.builder.mdx_lookup(self.word)
str_content = ""
if len(content) > 0:
@@ -321,7 +330,7 @@ class MdxService(LocalService):
return str_content
def _get_definition_mdd(self, word):
- """根据关键字得到MDX词典的媒体"""
+ """according to the keyword(param word) return the media file contents"""
word = word.replace('/', '\\')
content = self.builder.mdd_lookup(word)
if len(content) > 0:
@@ -330,7 +339,7 @@ class MdxService(LocalService):
return []
def get_html(self):
- """取得self.word对应的html页面"""
+ """get self.word's html page from MDX"""
if not self.html_cache[self.word]:
html = self._get_definition_mdx()
if html:
@@ -338,7 +347,7 @@ class MdxService(LocalService):
return self.html_cache[self.word]
def save_file(self, filepath_in_mdx, savepath):
- """从mmd中取出filepath_in_mdx媒体文件并保存到savepath"""
+ """according to filepath_in_mdx to get media file and save it to savepath"""
try:
bytes_list = self._get_definition_mdd(filepath_in_mdx)
if bytes_list:
@@ -372,7 +381,7 @@ class StardictService(LocalService):
else:
return self.builder.ifo.bookname.decode('utf-8')
- @export(u"default", 0)
+ @export([u'默认', u'Default'], 0)
def fld_whole(self):
#self.builder.check_build()
try:
diff --git a/src/fastwq/service/bing.py b/src/fastwq/service/bing.py
index 66500d6..b8ef0ea 100644
--- a/src/fastwq/service/bing.py
+++ b/src/fastwq/service/bing.py
@@ -5,7 +5,7 @@ from aqt.utils import showInfo, showText
from .base import WebService, export, register, with_styles, parseHtml
-@register(u'Bing')
+@register([u'必应', u'Bing'])
class Bing(WebService):
def __init__(self):
@@ -40,15 +40,15 @@ class Bing(WebService):
def _get_field(self, key, default=u''):
return self.cache_result(key) if self.cached(key) else self._get_content().get(key, default)
- @export(u'美式音标', 1)
+ @export('AME_PHON', 1)
def fld_phonetic_us(self):
return self._get_field('phonitic_us')
- @export(u'英式音标', 2)
+ @export('BRE_PHON', 2)
def fld_phonetic_uk(self):
return self._get_field('phonitic_uk')
- @export(u'词语时态', 3)
+ @export([u'词语时态', u'Participle'], 3)
def fld_participle(self):
return self._get_field('participle')
@@ -56,7 +56,7 @@ class Bing(WebService):
def _css(self, val):
return val
- @export(u'释义', 4)
+ @export('DEF', 4)
def fld_definition(self):
val = self._get_field('def')
if val == None or val == '':
diff --git a/src/fastwq/service/bing3tp.py b/src/fastwq/service/bing3tp.py
index 2a95fd1..3a4c035 100644
--- a/src/fastwq/service/bing3tp.py
+++ b/src/fastwq/service/bing3tp.py
@@ -1,9 +1,5 @@
#-*- coding:utf-8 -*-
import json
-import re
-import urllib2
-
-from aqt.utils import showInfo, showText
from .base import WebService, export, register, with_styles
bing_download_mp3 = True
@@ -21,13 +17,15 @@ class BingXtk(WebService):
'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(' ', '_')
+ url = u'http://xtk.azurewebsites.net/BingDictService.aspx?Word={}'.format(word.encode('utf-8'))
try:
- word = self.word.replace(' ', '_')
- request = urllib2.Request(u'http://xtk.azurewebsites.net/BingDictService.aspx?Word=' +\
- word.encode('utf-8'), headers=headers)
- resp = json.loads(urllib2.urlopen(request).read())
+ #request = urllib2.Request(u'http://xtk.azurewebsites.net/BingDictService.aspx?Word=' +\
+ # word.encode('utf-8'), headers=headers)
+ #resp = json.loads(urllib2.urlopen(request).read())
+ resp = json.loads(self.get_response(url, headers=headers, timeout=10))
return self.cache_this(resp)
- except Exception as e:
+ except:
return resp
def _get_field(self, key, default=u''):
@@ -41,17 +39,17 @@ class BingXtk(WebService):
subfield = default
return subfield
- @export(u'美式音标', 1)
+ @export('AME_PHON', 1)
def fld_phonetic_us(self):
seg = self._get_field('pronunciation')
return self._get_subfield(seg, 'AmE')
- @export(u'英式音标', 2)
+ @export('BRE_PHON', 2)
def fld_phonetic_uk(self):
seg = self._get_field('pronunciation')
return self._get_subfield(seg, 'BrE')
- @export(u'美式发音', 3)
+ @export('AME_PRON', 3)
def fld_mp3_us(self):
seg = audio_url = self._get_field('pronunciation')
audio_url = self._get_subfield(seg, 'AmEmp3')
@@ -61,7 +59,7 @@ class BingXtk(WebService):
return self.get_anki_label(filename, 'audio')
return audio_url
- @export(u'英式发音', 4)
+ @export('BRE_PRON', 4)
def fld_mp3_uk(self):
seg = self._get_field('pronunciation')
audio_url = self._get_subfield(seg, 'BrEmp3')
@@ -75,15 +73,16 @@ class BingXtk(WebService):
def _css(self, val):
return val
- @export(u'释义', 5)
+ @export('DEF', 5)
def fld_definition(self):
segs = self._get_field('defs')
if isinstance(segs, list) and len(segs) > 0:
- val = u'
'.join([u'{0} {1}'.format(seg['pos'], seg['def']) for seg in segs])
+ val = u'
'.join([u'''{0}
+ {1}'''.format(seg['pos'], seg['def']) for seg in segs])
return self._css(val)
return ''
- @export(u'例句', 6)
+ @export('EXAMPLE', 6)
# @with_styles(cssfile='_bing2.css', need_wrap_css=True, wrap_class=u'bing')
def fld_samples(self):
max_numbers = 10
@@ -92,11 +91,9 @@ class BingXtk(WebService):
for i, seg in enumerate(segs):
sentences = sentences +\
u"""""".format(seg['eng'], seg['chn'], i + 1)
+ """.format(seg['eng'], seg['chn'])#, i + 1)
if i == 9:
break
return u"""
diff --git a/src/fastwq/service/pool.py b/src/fastwq/service/pool.py
index 2446c10..39b88c1 100644
--- a/src/fastwq/service/pool.py
+++ b/src/fastwq/service/pool.py
@@ -39,6 +39,8 @@ class ServicePool(object):
return self.manager.get_service(unique)
def put(self, service):
+ if service is None:
+ return
unique = service.unique
queue = self.pools.get(unique, None)
if queue == None:
diff --git a/src/fastwq/ui.py b/src/fastwq/ui.py
index 3b0cd9b..5df1494 100644
--- a/src/fastwq/ui.py
+++ b/src/fastwq/ui.py
@@ -309,6 +309,7 @@ class OptionsDialog(QDialog):
self.setLayout(self.main_layout)
self.resize(widget_size.dialog_width,
(i + 1) * widget_size.map_max_height + widget_size.dialog_height_margin)
+ self.save()
def show_models(self):
edit = QPushButton(anki.lang._("Manage"),
@@ -384,13 +385,13 @@ class OptionsDialog(QDialog):
unique = dict_combo_itemdata
service = service_pool.get(unique)
# problem
+ field_combo.setEditText(u'')
if service and service.support and service.fields:
for each in service.fields:
field_combo.addItem(each)
if each == field_text:
field_combo.setEditText(field_text)
-
- field_combo.setEnabled(service.support)
+ field_combo.setEnabled(service != None and service.support)
service_pool.put(service)
def radio_btn_checked(self):