From f73111fc7ca4a116b6aca2725efcfe2d7813a987 Mon Sep 17 00:00:00 2001
From: "St.Huang" <wenhonghuang@gmail.com>
Date: Sun, 8 Jul 2018 03:21:28 +0800
Subject: [PATCH] Make it the same as Bing.

---
 src/fastwq/service/bing3tp.py | 77 +++++++++++++++--------------------
 1 file changed, 33 insertions(+), 44 deletions(-)

diff --git a/src/fastwq/service/bing3tp.py b/src/fastwq/service/bing3tp.py
index 3a4c035..5e523fd 100644
--- a/src/fastwq/service/bing3tp.py
+++ b/src/fastwq/service/bing3tp.py
@@ -1,73 +1,62 @@
 #-*- coding:utf-8 -*-
 import json
+import re
 from .base import WebService, export, register, with_styles
 
 bing_download_mp3 = True
 
-
-@register(u'Bing xtk')
+@register([u'Bing xtk', u'Bing xtk'])
 class BingXtk(WebService):
 
     def __init__(self):
         super(BingXtk, self).__init__()
 
     def _get_content(self):
-        resp = {'pronunciation': '', 'defs': '', 'sams': ''}
+        result = {
+            'pronunciation': {'AmE': '', 'BrE': '', 'AmEmp3': '', 'BrEmp3': ''},
+            'def': '',
+            'sams': '',
+        }
         headers = {
             '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'))
+        word = self.word.replace(' ', '_').encode('utf-8')
+        url = u'http://xtk.azurewebsites.net/BingDictService.aspx?Word={}'.format(word)
         try:
-            #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)
+            result.update(json.loads(self.get_response(url, headers=headers, timeout=10)))
+            return self.cache_this(result)
         except:
-            return resp
+            return result
 
     def _get_field(self, key, default=u''):
         return self.cache_result(key) if self.cached(key) else self._get_content().get(key, default)
 
-    def _get_subfield(self, field, key, default=u''):
-        subfield = default
-        if field:
-            subfield = field.get(key, default)
-            if subfield is None:
-                subfield = default
-        return subfield
-
     @export('AME_PHON', 1)
     def fld_phonetic_us(self):
         seg = self._get_field('pronunciation')
-        return self._get_subfield(seg, 'AmE')
+        return seg.get('AmE', u'')
 
     @export('BRE_PHON', 2)
     def fld_phonetic_uk(self):
         seg = self._get_field('pronunciation')
-        return self._get_subfield(seg, 'BrE')
+        return seg.get('BrE', u'')
+
+    def _fld_mp3(self, fld):
+        audio_url = self._get_field('pronunciation')[fld]
+        if bing_download_mp3 and audio_url:
+            filename = u''.join(re.findall(r'\w*\.mp3', audio_url))
+            if filename and self.download(audio_url, filename):
+                return self.get_anki_label(u'bing_{0}_{1}'.format(fld, filename), 'audio')
+        return ''
 
     @export('AME_PRON', 3)
     def fld_mp3_us(self):
-        seg = audio_url = self._get_field('pronunciation')
-        audio_url = self._get_subfield(seg, 'AmEmp3')
-        if bing_download_mp3 and audio_url:
-            filename = u'bing_{}_us.mp3'.format(self.word)
-            if self.download(audio_url, filename):
-                return self.get_anki_label(filename, 'audio')
-        return audio_url
+        return self._fld_mp3('AmEmp3')
 
     @export('BRE_PRON', 4)
     def fld_mp3_uk(self):
-        seg = self._get_field('pronunciation')
-        audio_url = self._get_subfield(seg, 'BrEmp3')
-        if bing_download_mp3 and audio_url:
-            filename = u'bing_{}_br.mp3'.format(self.word)
-            if self.download(audio_url, filename):
-                return self.get_anki_label(filename, 'audio')
-        return audio_url
+        return self._fld_mp3('BrEmp3')
     
     @with_styles(css='.pos{font-weight:bold;margin-right:4px;}', need_wrap_css=True, wrap_class='bing')
     def _css(self, val):
@@ -83,21 +72,21 @@ class BingXtk(WebService):
         return ''
     
     @export('EXAMPLE', 6)
-    # @with_styles(cssfile='_bing2.css', need_wrap_css=True, wrap_class=u'bing')
     def fld_samples(self):
         max_numbers = 10
         segs = self._get_field('sams')
         sentences = ''
         for i, seg in enumerate(segs):
-            sentences = sentences +\
-                u"""<li><div class="se_li1">
+            sentences += u"""<li><div class="se_li1">
                             <div class="sen_en">{0}</div>
                             <div class="sen_cn">{1}</div>
-                        </div></li>""".format(seg['eng'], seg['chn'])#, i + 1)
+                        </div></li>""".format(seg['eng'], seg['chn'])
             if i == 9:
                 break
-        return u"""<div class="se_div">
-                        <div class="sentenceCon">
-                            <div id="sentenceSeg"><ol>{}</ol></div>
-                        </div>
-                </div>""".format(sentences)
+        if sentences:
+            return u"""<div class="se_div">
+                            <div class="sentenceCon">
+                                <div id="sentenceSeg"><ol>{0}</ol></div>
+                            </div>
+                    </div>""".format(sentences)
+        return ''