Merge pull request #122 from JavanZhu/master

Fix and add some new features
This commit is contained in:
sthoo 2019-02-23 10:59:42 +08:00 committed by GitHub
commit 6cd082ba5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -372,7 +372,7 @@ class WebService(Service):
be added onto the stream returned. This is helpful for some web be added onto the stream returned. This is helpful for some web
services that sometimes return MP3s that `mplayer` clips early. services that sometimes return MP3s that `mplayer` clips early.
""" """
DEFAULT_UA = 'Mozilla/5.0' DEFAULT_UA = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.67 Safari/537.36'
DEFAULT_TIMEOUT = 3 DEFAULT_TIMEOUT = 3
PADDING = '\0' * 2**11 PADDING = '\0' * 2**11

View File

@ -51,6 +51,9 @@ class Cambridge(WebService):
if snd: if snd:
result['pronunciation'][pn+'mp3'] = cambridge_url_base + snd.get('data-src-mp3') result['pronunciation'][pn+'mp3'] = cambridge_url_base + snd.get('data-src-mp3')
header_found = True header_found = True
# 词性
pg = element.find('span', class_='posgram ico-bg')
#义 #义
body = element.find('div', class_='pos-body') body = element.find('div', class_='pos-body')
if body: if body:
@ -63,9 +66,11 @@ class Cambridge(WebService):
trans = tag.find('span', class_='trans') trans = tag.find('span', class_='trans')
es = tag.find_all('div', class_='examp emphasized') es = tag.find_all('div', class_='examp emphasized')
l.append( l.append(
u'<li>{0}{1}{2}{3}</li>'.format( u'<li>{0}{1}{2} {3}{4}</li>'.format(
'<span class="epp-xref">{0}</span>'.format(pg.get_text() if pg else ''),
u'<span class="epp-xref">{0}</span>'.format(i.get_text()) if i else u'', u'<span class="epp-xref">{0}</span>'.format(i.get_text()) if i else u'',
u'<b class="def">{0}</b>'.format(d.get_text()) if d else u'', u'<b class="def">{0}</b>'.format(d.get_text()) if d else u'',
u'<span class="trans">{0}</span>'.format(trans.get_text()) if trans else u'', u'<span class="trans">{0}</span>'.format(trans.get_text()) if trans else u'',
u''.join( u''.join(
u'<div class="examp">{0}</div>'.format(e.get_text()) if e else u'' u'<div class="examp">{0}</div>'.format(e.get_text()) if e else u''