ouczbs/anki-word-query
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #128 from JavanZhu/master

Browse Source 
Update request user agent.
This commit is contained in:
sthoo 2019-03-07 13:48:31 +08:00 committed by GitHub
commit 27dd65c635
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons21/fastwq/service/base.py
View File

@ -67,6 +67,9 @@ __all__ = [
'Service', 'WebService', 'LocalService', 'MdxService', 'StardictService', 'QueryResult' 'Service', 'WebService', 'LocalService', 'MdxService', 'StardictService', 'QueryResult'
] ]
_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'
def get_hex_name(prefix, val, suffix): def get_hex_name(prefix, val, suffix):
''' get sha1 hax name ''' ''' get sha1 hax name '''
@ -316,7 +319,7 @@ class WebService(Service):
def get_response(self, url, data=None, headers=None, timeout=10): def get_response(self, url, data=None, headers=None, timeout=10):
default_headers = { default_headers = {
'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.6) Gecko/20091201 Firefox/3.5.6' 'User-Agent': _default_ua
} }
if headers: if headers:
default_headers.update(headers) default_headers.update(headers)
@ -338,8 +341,7 @@ class WebService(Service):
try: try:
with open(filename, "wb") as f: with open(filename, "wb") as f:
f.write(requests.get(url, headers={ f.write(requests.get(url, headers={
'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 ' 'User-Agent': _default_ua
'(KHTML, like Gecko) Chrome/31.0.1623.0 Safari/537.36'
}).content) }).content)
return True return True
except Exception: except Exception:
@ -372,7 +374,6 @@ 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 (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
@ -411,7 +412,7 @@ class WebService(Service):
desc = "web request" if len(targets) == 1 \ desc = "web request" if len(targets) == 1 \
else "web request (%d of %d)" % (number, len(targets)) else "web request (%d of %d)" % (number, len(targets))
headers = {'User-Agent': DEFAULT_UA} headers = {'User-Agent': _default_ua}
if custom_headers: if custom_headers:
headers.update(custom_headers) headers.update(custom_headers)