From b2754e080c9fbf88baabe6527334c0ba0a140ab9 Mon Sep 17 00:00:00 2001
From: "St.Huang" <wenhonghuang@gmail.com>
Date: Tue, 14 Aug 2018 14:14:03 +0800
Subject: [PATCH] fix #31

---
 addons/fastwq/service/dict/LDOCE6.py   | 27 +++++++++++++++-----------
 addons21/fastwq/service/dict/LDOCE6.py | 26 ++++++++++++++-----------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/addons/fastwq/service/dict/LDOCE6.py b/addons/fastwq/service/dict/LDOCE6.py
index 49cdb0e..8117a9c 100644
--- a/addons/fastwq/service/dict/LDOCE6.py
+++ b/addons/fastwq/service/dict/LDOCE6.py
@@ -2,27 +2,32 @@
 import re
 from ..base import *
 
+
 VOICE_PATTERN = r'<a href="sound://([\w/]+\w*\.mp3)"><img src="img/spkr_%s.png"></a>'
+VOICE_PATTERN_WQ = r'<span class="%s"><a href="sound://([\w/]+\w*\.mp3)">(.*?)</span %s>'
 MAPPINGS = [
-    ['br', [re.compile(VOICE_PATTERN % r'r')]],
-    ['us', [re.compile(VOICE_PATTERN % r'b')]]
+    ['br', [re.compile(VOICE_PATTERN % r'r'), re.compile(VOICE_PATTERN_WQ % (r'brevoice', r'brevoice'))]],
+    ['us', [re.compile(VOICE_PATTERN % r'b'), re.compile(VOICE_PATTERN_WQ % (r'amevoice', r'amevoice'))]]
 ]
 LANG_TO_REGEXPS = {lang: regexps for lang, regexps in MAPPINGS}
+DICT_PATH = u'' # u'E:\\BaiduYunDownload\\mdx\\L6mp3.mdx'
 
 
 @register([u'本地词典-LDOCE6', u'MDX-LDOCE6'])
 class Ldoce6(MdxService):
 
     def __init__(self):
-        from ...service import service_manager, service_pool
-        dict_path = ''
-        for clazz in service_manager.mdx_services:
-            service = service_pool.get(clazz.__unique__)
-            title = service.builder._title if service and service.support else u''
-            service_pool.put(service)
-            if title.startswith(u'LDOCE6'):
-                dict_path = service.dict_path
-                break
+        dict_path = DICT_PATH
+        # if DICT_PATH is a path, stop auto detect
+        if not dict_path:
+            from ...service import service_manager, service_pool
+            for clazz in service_manager.mdx_services:
+                service = service_pool.get(clazz.__unique__)
+                title = service.builder._title if service and service.support else u''
+                service_pool.put(service)
+                if title.startswith(u'LDOCE6'):
+                    dict_path = service.dict_path
+                    break
         super(Ldoce6, self).__init__(dict_path)
 
     @property
diff --git a/addons21/fastwq/service/dict/LDOCE6.py b/addons21/fastwq/service/dict/LDOCE6.py
index fc0f0fa..2493d09 100644
--- a/addons21/fastwq/service/dict/LDOCE6.py
+++ b/addons21/fastwq/service/dict/LDOCE6.py
@@ -4,26 +4,30 @@ from ..base import *
 
 
 VOICE_PATTERN = r'<a href="sound://([\w/]+\w*\.mp3)"><img src="img/spkr_%s.png"></a>'
+VOICE_PATTERN_WQ = r'<span class="%s"><a href="sound://([\w/]+\w*\.mp3)">(.*?)</span %s>'
 MAPPINGS = [
-    ['br', [re.compile(VOICE_PATTERN % r'r')]],
-    ['us', [re.compile(VOICE_PATTERN % r'b')]]
+    ['br', [re.compile(VOICE_PATTERN % r'r'), re.compile(VOICE_PATTERN_WQ % (r'brevoice', r'brevoice'))]],
+    ['us', [re.compile(VOICE_PATTERN % r'b'), re.compile(VOICE_PATTERN_WQ % (r'amevoice', r'amevoice'))]]
 ]
 LANG_TO_REGEXPS = {lang: regexps for lang, regexps in MAPPINGS}
+DICT_PATH = u'' # u'E:\\BaiduYunDownload\\mdx\\L6mp3.mdx'
 
 
 @register([u'本地词典-LDOCE6', u'MDX-LDOCE6'])
 class Ldoce6(MdxService):
 
     def __init__(self):
-        from ...service import service_manager, service_pool
-        dict_path = ''
-        for clazz in service_manager.mdx_services:
-            service = service_pool.get(clazz.__unique__)
-            title = service.builder._title if service and service.support else u''
-            service_pool.put(service)
-            if title.startswith(u'LDOCE6'):
-                dict_path = service.dict_path
-                break
+        dict_path = DICT_PATH
+        # if DICT_PATH is a path, stop auto detect
+        if not dict_path:
+            from ...service import service_manager, service_pool
+            for clazz in service_manager.mdx_services:
+                service = service_pool.get(clazz.__unique__)
+                title = service.builder._title if service and service.support else u''
+                service_pool.put(service)
+                if title.startswith(u'LDOCE6'):
+                    dict_path = service.dict_path
+                    break
         super(Ldoce6, self).__init__(dict_path)
 
     @property