split dict into 2 groups

application/lib/calibre/web/feeds/news.py

@@ -2074,9 +2074,10 @@ def translate_titles(self, feeds):
         translator = HtmlTranslator(self.translator, self.simultaneous_downloads)
         position = self.translator.get('position', 'below')
         texts = []
+
         #内嵌函数
         def _addTextItem(obj, attr):
-            return texts.append({'text': getattr(obj, attr, None), 'obj': obj, 'attr': attr})
+            texts.append({'text': getattr(obj, attr, None), 'obj': obj, 'attr': attr})
 
         for feed in feeds:
             _addTextItem(feed, 'title')
@@ -2101,7 +2102,6 @@ def _addTextItem(obj, attr):
                 setattr(obj, attr, item['translated'])
 
     #调用在线TTS服务平台，将html转为语音
-    #每个音频片段都会调用一次callback(audioDict, title, feed_index, article_index)
     def audiofy_html(self, soup, title, job_info):
         from ebook_tts import HtmlAudiolator
         audiolator = HtmlAudiolator(self.tts)

application/lib/dictionary/babylon/babylon_dict.py

@@ -23,6 +23,7 @@ def getBglDictList():
 
 class BabylonDict:
     name = "babylon"
+    mode = "offline"
     #词典列表，键为词典缩写，值为词典描述
     databases = getBglDictList()
 

application/lib/dictionary/dict_cc.py

@@ -41,6 +41,7 @@ def n_results(self):
 
 class DictCc:
     name = "dict.cc"
+    mode = "online"
     #词典列表，键为词典缩写，值为词典描述
     databases = {"en": "English",
         "de": "German",

application/lib/dictionary/dict_cn.py

@@ -6,6 +6,7 @@
 
 class DictCn:
     name = "dict.cn"
+    mode = "online"
     #词典列表，键为词典缩写，值为词典描述
     databases = {"english": "English-Chinese Translation Dictionary"}
 

application/lib/dictionary/dict_org.py

@@ -6,6 +6,7 @@
 
 class DictOrg:
     name = "dict.org"
+    mode = "online"
     #词典列表，键为词典缩写，值为词典描述
     databases = {"!": "First match",
         "gcide": "The Collaborative International Dictionary of English v.0.48",

application/lib/dictionary/lingvo/lingvo_dict.py

@@ -23,6 +23,7 @@ def getDslDictList():
 
 class LingvoDict:
     name = "lingvo"
+    mode = "offline"
     #词典列表，键为词典缩写，值为词典描述
     databases = getDslDictList()
 

application/lib/dictionary/mdict/mdict.py

@@ -28,6 +28,7 @@ def getMDictFileList():
 
 class MDict:
     name = "mdict"
+    mode = "offline"
     #词典列表，键为词典缩写，值为词典描述
     databases = getMDictFileList()
 

application/lib/dictionary/merriam_webster.py

@@ -8,6 +8,7 @@
 
 class MerriamWebster:
     name = "webster's"
+    mode = "online"
     #词典列表，键为词典缩写，值为词典描述
     databases = {"english": "Webster's New International Dictionary"}
 

application/lib/dictionary/oxford_learners.py

@@ -7,6 +7,7 @@
 
 class OxfordLearners:
     name = "oxford's"
+    mode = "online"
     #词典列表，键为词典缩写，值为词典描述
     databases = {"learner": "Advanced Learner's Dictionary",
         "advanced": "Advanced American Dictionary"}

application/lib/dictionary/stardict/stardict.py

@@ -23,6 +23,7 @@ def getStarDictList():
 
 class StarDict:
     name = "stardict"
+    mode = "offline"
     #词典列表，键为词典缩写，值为词典描述
     databases = getStarDictList()
 

application/lib/urlopener.py

@@ -63,7 +63,7 @@ def __init__(self, *, host=None, timeout=60, headers=None, file_stub=None, user_
             self.addheaders[0] = ('User-Agent', user_agent)
 
         self.fs = file_stub #FsDictStub
-        self.session = requests.session()
+        self.session = requests.Session()
         if self._proxies:
             self.session.proxies.update(self._proxies)
         self.prevRespRef = None #对Response实例的一个弱引用

application/static/base.js

@@ -1716,16 +1716,28 @@ function SendTestEmail() {
 
 //根据词典引擎列表 g_dictEngines 和 当前配置 g_dictParams 填充下拉框
 function PopulateDictFields() {
-  for (var idx = 0; idx < 3; idx++) {
-    var cfg = g_dictParams[idx];
-    var engineSel = $('#dict_engine' + idx);
+  for (let idx = 0; idx < 3; idx++) {
+    const cfg = g_dictParams[idx];
+    const engineSel = $('#dict_engine' + idx);
     engineSel.empty();
-    var engineName = cfg.engine;
-    for (var name in g_dictEngines) {
-      var selected = (engineName == name) ? 'selected="selected"' : '';
-      var txt = `<option value="${name}" ${selected}>${name}</option>`;
-      engineSel.append($(txt));
+    const engineName = cfg.engine;
+    const groupedEngines = {'Online': [], 'Offline': []};
+    for (const name in g_dictEngines) { //分组词典引擎
+      const mode = g_dictEngines[name].mode;
+      groupedEngines[(mode === 'online') ? 'Online' : 'Offline'].push(name);
     }
+
+    //添加选项到engineSel
+    ['Online', 'Offline'].forEach((group) => {
+      if (groupedEngines[group].length) {
+        const grp = $('<optgroup>', { label: group });
+        groupedEngines[group].forEach((name) => {
+          const selected = (engineName === name) ? 'selected' : '';
+          grp.append($(`<option value="${name}" ${selected}>${name}</option>`));
+        });
+        engineSel.append(grp);
+      }
+    });
   }
 }
 

application/view/adv.py

@@ -398,7 +398,7 @@ def AdvDict(user: KeUser):
         if hasattr(dic, 'refresh'):
             dic.refresh()
 
-    engines = {name: {'databases': klass.databases} for name,klass in all_dict_engines.items()}
+    engines = {name: {'databases': klass.databases, 'mode': klass.mode} for name,klass in all_dict_engines.items()}
     return adv_render_template('adv_dict.html', 'dictionary', user=user, engines=engines, 
         dictParams=dictParams, tips='', langMap=LangMap())
 

application/view/reader.py

@@ -174,7 +174,7 @@ def ReaderDictRoute(user: KeUser, userDir: str):
         if hasattr(dic, 'refresh'):
             dic.refresh()
 
-    engines = {name: {'databases': klass.databases} for name,klass in all_dict_engines.items()}
+    engines = {name: {'databases': klass.databases, 'mode': klass.mode} for name,klass in all_dict_engines.items()}
     return render_template('word_lookup.html', user=user, engines=engines, tips='', langMap=LangMap())
 
 #Api查词