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

Fix bing search query parser to work with mobile UAs

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-30 17:51:24 +05:30
parent b9c781b5e0
commit 7f099475b2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/metadata/sources/search_engines.py
View File

@ -20,7 +20,7 @@ from calibre import browser as _browser, prints, random_user_agent
from calibre.utils.monotonic import monotonic from calibre.utils.monotonic import monotonic
from calibre.utils.random_ua import accept_header_for_ua from calibre.utils.random_ua import accept_header_for_ua
current_version = (1, 0, 2) current_version = (1, 0, 3)
minimum_calibre_version = (2, 80, 0) minimum_calibre_version = (2, 80, 0)
@ -34,6 +34,7 @@ def tostring(elem):
def browser(): def browser():
ua = random_user_agent(allow_ie=False) ua = random_user_agent(allow_ie=False)
# ua = 'Mozilla/5.0 (Linux; Android 8.0.0; VTR-L29; rv:63.0) Gecko/20100101 Firefox/63.0'
br = _browser(user_agent=ua) br = _browser(user_agent=ua)
br.set_handle_gzip(True) br.set_handle_gzip(True)
br.addheaders += [ br.addheaders += [
@ -180,7 +181,8 @@ def bing_search(terms, site=None, br=None, log=prints, safe_search=False, dump_r
root = query(br, url, 'bing', dump_raw, timeout=timeout) root = query(br, url, 'bing', dump_raw, timeout=timeout)
ans = [] ans = []
for li in root.xpath('//*[@id="b_results"]/li[@class="b_algo"]'): for li in root.xpath('//*[@id="b_results"]/li[@class="b_algo"]'):
a = li.xpath('descendant::h2/a[@href]')[0] a = li.xpath('descendant::h2/a[@href]') or li.xpath('descendant::div[@class="b_algoheader"]/a[@href]')
a = a[0]
title = tostring(a) title = tostring(a)
try: try:
div = li.xpath('descendant::div[@class="b_attribution" and @u]')[0] div = li.xpath('descendant::div[@class="b_attribution" and @u]')[0]