Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some mobile user agents not being filtered out from random_user_agent

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-30 16:34:03 +05:30
parent 30232ebd52
commit e6fd5e4c0c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/__init__.py
View File

@ -373,10 +373,14 @@ USER_AGENT = 'Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko'
USER_AGENT_MOBILE = 'Mozilla/5.0 (Windows; U; Windows CE 5.1; rv:1.8.1a3) Gecko/20060610 Minimo/0.016' USER_AGENT_MOBILE = 'Mozilla/5.0 (Windows; U; Windows CE 5.1; rv:1.8.1a3) Gecko/20060610 Minimo/0.016'
def is_mobile_ua(ua):
return 'Mobile/' in ua or 'Mobile ' in ua
def random_user_agent(choose=None, allow_ie=True): def random_user_agent(choose=None, allow_ie=True):
from calibre.utils.random_ua import common_user_agents from calibre.utils.random_ua import common_user_agents
ua_list = common_user_agents() ua_list = common_user_agents()
ua_list = list(filter(lambda x: 'Mobile/' not in x, ua_list)) ua_list = list(filter(lambda x: not is_mobile_ua(x), ua_list))
if not allow_ie: if not allow_ie:
ua_list = list(filter(lambda x: 'Trident/' not in x and 'Edge/' not in x, ua_list)) ua_list = list(filter(lambda x: 'Trident/' not in x and 'Edge/' not in x, ua_list))
return random.choice(ua_list) if choose is None else ua_list[choose] return random.choice(ua_list) if choose is None else ua_list[choose]