bug fixes.
This commit is contained in:
parent
90cf0834d1
commit
2fc6de3af0
@ -36,8 +36,7 @@ class Baicizhan(WebService):
|
|||||||
@export('PRON')
|
@export('PRON')
|
||||||
def fld_phonetic(self):
|
def fld_phonetic(self):
|
||||||
url = u'http://baicizhan.qiniucdn.com/word_audios/{}.mp3'.format(self.quote_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(), url, 'mp3')
|
||||||
audio_name = get_hex_name(self.unique.lower(), audio_name, 'mp3')
|
|
||||||
if self.bcz_download_mp3:
|
if self.bcz_download_mp3:
|
||||||
if os.path.exists(audio_name) or self.download(url, audio_name, 5):
|
if os.path.exists(audio_name) or self.download(url, audio_name, 5):
|
||||||
with open(audio_name, 'rb') as f:
|
with open(audio_name, 'rb') as f:
|
||||||
|
|||||||
@ -71,8 +71,7 @@ class Baidu_Chinese(WebService):
|
|||||||
def fld_pron(self):
|
def fld_pron(self):
|
||||||
audio_url = self._get_field('audio_url')
|
audio_url = self._get_field('audio_url')
|
||||||
if baidu_download_mp3 and audio_url:
|
if baidu_download_mp3 and audio_url:
|
||||||
filename = u'_baidu_chinese_{}_.mp3'.format(self.word)
|
filename = get_hex_name(self.unique.lower(), audio_url, 'mp3')
|
||||||
filename = get_hex_name(self.unique.lower(), filename, 'mp3')
|
|
||||||
try:
|
try:
|
||||||
if os.path.exists(filename) or self.net_download(
|
if os.path.exists(filename) or self.net_download(
|
||||||
filename,
|
filename,
|
||||||
|
|||||||
@ -60,8 +60,7 @@ class Frdic(WebService):
|
|||||||
url = 'https://api.frdic.com/api/v2/speech/speakweb?langid=fr&txt=QYN{word}'.format(
|
url = 'https://api.frdic.com/api/v2/speech/speakweb?langid=fr&txt=QYN{word}'.format(
|
||||||
word=urllib2.quote(base64.b64encode(self.word.encode('utf-8')))
|
word=urllib2.quote(base64.b64encode(self.word.encode('utf-8')))
|
||||||
)
|
)
|
||||||
filename = u'frdic_{word}.mp3'.format(word=self.word)
|
filename = get_hex_name(self.unique.lower(), url, 'mp3')
|
||||||
filename = get_hex_name(self.unique.lower(), filename, 'mp3')
|
|
||||||
if os.path.exists(filename) or self.net_download(filename, url):
|
if os.path.exists(filename) or self.net_download(filename, url):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return ''
|
return ''
|
||||||
|
|||||||
@ -58,7 +58,7 @@ class ICIBA(WebService):
|
|||||||
if not audio_url:
|
if not audio_url:
|
||||||
audio_url, t = seg['symbols'][0]['ph_tts_mp3'], 'tts'
|
audio_url, t = seg['symbols'][0]['ph_tts_mp3'], 'tts'
|
||||||
if iciba_download_mp3 and audio_url:
|
if iciba_download_mp3 and audio_url:
|
||||||
filename = u'iciba_{0}_{1}.mp3'.format(self.word, t)
|
filename = get_hex_name(self.unique.lower(), audio_url, 'mp3')
|
||||||
if os.path.exists(filename) or self.download(audio_url, filename):
|
if os.path.exists(filename) or self.download(audio_url, filename):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return audio_url
|
return audio_url
|
||||||
@ -71,7 +71,7 @@ class ICIBA(WebService):
|
|||||||
if not audio_url:
|
if not audio_url:
|
||||||
audio_url, t = seg['symbols'][0]['ph_tts_mp3'], 'tts'
|
audio_url, t = seg['symbols'][0]['ph_tts_mp3'], 'tts'
|
||||||
if iciba_download_mp3 and audio_url:
|
if iciba_download_mp3 and audio_url:
|
||||||
filename = u'iciba_{0}_{1}.mp3'.format(self.word, t)
|
filename = get_hex_name(self.unique.lower(), audio_url, 'mp3')
|
||||||
if os.path.exists(filename) or self.download(audio_url, filename):
|
if os.path.exists(filename) or self.download(audio_url, filename):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return audio_url
|
return audio_url
|
||||||
|
|||||||
@ -71,14 +71,14 @@ class OxfordLearning(WebService):
|
|||||||
|
|
||||||
def get_sound_bre(self):
|
def get_sound_bre(self):
|
||||||
url = self._get_single_dict('s_bre')
|
url = self._get_single_dict('s_bre')
|
||||||
filename = u'oxford_{}_uk.mp3'.format(self.word)
|
filename = get_hex_name(self.unique.lower(), url, 'mp3')
|
||||||
if url and self.download(url, filename):
|
if url and self.download(url, filename):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
def get_sound_ame(self):
|
def get_sound_ame(self):
|
||||||
url = self._get_single_dict('s_ame')
|
url = self._get_single_dict('s_ame')
|
||||||
filename = u'oxford_{}_us.mp3'.format(self.word)
|
filename = get_hex_name(self.unique.lower(), url, 'mp3')
|
||||||
if url and self.download(url, filename):
|
if url and self.download(url, filename):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return ''
|
return ''
|
||||||
|
|||||||
@ -36,8 +36,7 @@ class Baicizhan(WebService):
|
|||||||
@export('PRON')
|
@export('PRON')
|
||||||
def fld_phonetic(self):
|
def fld_phonetic(self):
|
||||||
url = u'http://baicizhan.qiniucdn.com/word_audios/{}.mp3'.format(self.quote_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(), url, 'mp3')
|
||||||
audio_name = get_hex_name(self.unique.lower(), audio_name, 'mp3')
|
|
||||||
if self.bcz_download_mp3:
|
if self.bcz_download_mp3:
|
||||||
if os.path.exists(audio_name) or self.download(url, audio_name, 5):
|
if os.path.exists(audio_name) or self.download(url, audio_name, 5):
|
||||||
with open(audio_name, 'rb') as f:
|
with open(audio_name, 'rb') as f:
|
||||||
|
|||||||
@ -71,8 +71,7 @@ class Baidu_Chinese(WebService):
|
|||||||
def fld_pron(self):
|
def fld_pron(self):
|
||||||
audio_url = self._get_field('audio_url')
|
audio_url = self._get_field('audio_url')
|
||||||
if baidu_download_mp3 and audio_url:
|
if baidu_download_mp3 and audio_url:
|
||||||
filename = u'_baidu_chinese_{}_.mp3'.format(self.word)
|
filename = get_hex_name(self.unique.lower(), audio_url, 'mp3')
|
||||||
filename = get_hex_name(self.unique.lower(), filename, 'mp3')
|
|
||||||
try:
|
try:
|
||||||
if os.path.exists(filename) or self.net_download(
|
if os.path.exists(filename) or self.net_download(
|
||||||
filename,
|
filename,
|
||||||
|
|||||||
@ -60,8 +60,7 @@ class Frdic(WebService):
|
|||||||
url = 'https://api.frdic.com/api/v2/speech/speakweb?langid=fr&txt=QYN{word}'.format(
|
url = 'https://api.frdic.com/api/v2/speech/speakweb?langid=fr&txt=QYN{word}'.format(
|
||||||
word=urllib2.quote(base64.b64encode(self.word.encode('utf-8')))
|
word=urllib2.quote(base64.b64encode(self.word.encode('utf-8')))
|
||||||
)
|
)
|
||||||
filename = u'frdic_{word}.mp3'.format(word=self.word)
|
filename = get_hex_name(self.unique.lower(), url, 'mp3')
|
||||||
filename = get_hex_name(self.unique.lower(), filename, 'mp3')
|
|
||||||
if os.path.exists(filename) or self.net_download(filename, url):
|
if os.path.exists(filename) or self.net_download(filename, url):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return ''
|
return ''
|
||||||
|
|||||||
@ -58,7 +58,7 @@ class ICIBA(WebService):
|
|||||||
if not audio_url:
|
if not audio_url:
|
||||||
audio_url, t = seg['symbols'][0]['ph_tts_mp3'], 'tts'
|
audio_url, t = seg['symbols'][0]['ph_tts_mp3'], 'tts'
|
||||||
if iciba_download_mp3 and audio_url:
|
if iciba_download_mp3 and audio_url:
|
||||||
filename = u'iciba_{0}_{1}.mp3'.format(self.word, t)
|
filename = get_hex_name(self.unique.lower(), audio_url, 'mp3')
|
||||||
if os.path.exists(filename) or self.download(audio_url, filename):
|
if os.path.exists(filename) or self.download(audio_url, filename):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return audio_url
|
return audio_url
|
||||||
@ -71,7 +71,7 @@ class ICIBA(WebService):
|
|||||||
if not audio_url:
|
if not audio_url:
|
||||||
audio_url, t = seg['symbols'][0]['ph_tts_mp3'], 'tts'
|
audio_url, t = seg['symbols'][0]['ph_tts_mp3'], 'tts'
|
||||||
if iciba_download_mp3 and audio_url:
|
if iciba_download_mp3 and audio_url:
|
||||||
filename = u'iciba_{0}_{1}.mp3'.format(self.word, t)
|
filename = get_hex_name(self.unique.lower(), audio_url, 'mp3')
|
||||||
if os.path.exists(filename) or self.download(audio_url, filename):
|
if os.path.exists(filename) or self.download(audio_url, filename):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return audio_url
|
return audio_url
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
#from warnings import filterwarnings
|
#from warnings import filterwarnings
|
||||||
|
|
||||||
from bs4 import Tag
|
from bs4 import Tag
|
||||||
from ..base import WebService, export, register, with_styles, parse_html
|
from ..base import *
|
||||||
|
|
||||||
#filterwarnings('ignore')
|
#filterwarnings('ignore')
|
||||||
|
|
||||||
@ -77,14 +77,14 @@ class OxfordLearning(WebService):
|
|||||||
|
|
||||||
def get_sound_bre(self):
|
def get_sound_bre(self):
|
||||||
url = self._get_single_dict('s_bre')
|
url = self._get_single_dict('s_bre')
|
||||||
filename = u'oxford_{}_uk.mp3'.format(self.word)
|
filename = get_hex_name(self.unique.lower(), url, 'mp3')
|
||||||
if url and self.download(url, filename):
|
if url and self.download(url, filename):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
def get_sound_ame(self):
|
def get_sound_ame(self):
|
||||||
url = self._get_single_dict('s_ame')
|
url = self._get_single_dict('s_ame')
|
||||||
filename = u'oxford_{}_us.mp3'.format(self.word)
|
filename = get_hex_name(self.unique.lower(), url, 'mp3')
|
||||||
if url and self.download(url, filename):
|
if url and self.download(url, filename):
|
||||||
return self.get_anki_label(filename, 'audio')
|
return self.get_anki_label(filename, 'audio')
|
||||||
return ''
|
return ''
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user