ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[fix] pep8

This commit is contained in:
Adam Tauber 2014-12-05 20:03:16 +01:00
parent d959cb1c05
commit 611f4e2a86
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
searx/engines/google.py
View File

@ -1,4 +1,4 @@
## Google (Web) # Google (Web)
# #
# @website https://www.google.com # @website https://www.google.com
# @provide-api yes (https://developers.google.com/custom-search/) # @provide-api yes (https://developers.google.com/custom-search/)
@ -9,7 +9,7 @@
# @parse url, title, content, suggestion # @parse url, title, content, suggestion
from urllib import urlencode from urllib import urlencode
from urlparse import unquote,urlparse,parse_qsl from urlparse import urlparse, parse_qsl
from lxml import html from lxml import html
from searx.engines.xpath import extract_text, extract_url from searx.engines.xpath import extract_text, extract_url
@ -23,10 +23,13 @@ google_hostname = 'www.google.com'
search_path = '/search' search_path = '/search'
redirect_path = '/url' redirect_path = '/url'
images_path = '/images' images_path = '/images'
search_url = 'https://' + google_hostname + search_path + '?{query}&start={offset}&gbv=1' search_url = ('https://' +
google_hostname +
search_path +
'?{query}&start={offset}&gbv=1')
# specific xpath variables # specific xpath variables
results_xpath= '//li[@class="g"]' results_xpath = '//li[@class="g"]'
url_xpath = './/h3/a/@href' url_xpath = './/h3/a/@href'
title_xpath = './/h3' title_xpath = './/h3'
content_xpath = './/span[@class="st"]' content_xpath = './/span[@class="st"]'
@ -36,15 +39,18 @@ images_xpath = './/div/a'
image_url_xpath = './@href' image_url_xpath = './@href'
image_img_src_xpath = './img/@src' image_img_src_xpath = './img/@src'
# remove google-specific tracking-url # remove google-specific tracking-url
def parse_url(url_string): def parse_url(url_string):
parsed_url = urlparse(url_string) parsed_url = urlparse(url_string)
if parsed_url.netloc in [google_hostname, ''] and parsed_url.path==redirect_path: if (parsed_url.netloc in [google_hostname, '']
and parsed_url.path == redirect_path):
query = dict(parse_qsl(parsed_url.query)) query = dict(parse_qsl(parsed_url.query))
return query['q'] return query['q']
else: else:
return url_string return url_string
# do search-request # do search-request
def request(query, params): def request(query, params):
offset = (params['pageno'] - 1) * 10 offset = (params['pageno'] - 1) * 10
@ -52,7 +58,7 @@ def request(query, params):
if params['language'] == 'all': if params['language'] == 'all':
language = 'en' language = 'en'
else: else:
language = params['language'].replace('_','-').lower() language = params['language'].replace('_', '-').lower()
params['url'] = search_url.format(offset=offset, params['url'] = search_url.format(offset=offset,
query=urlencode({'q': query})) query=urlencode({'q': query}))
@ -74,11 +80,13 @@ def response(resp):
try: try:
url = parse_url(extract_url(result.xpath(url_xpath), search_url)) url = parse_url(extract_url(result.xpath(url_xpath), search_url))
parsed_url = urlparse(url) parsed_url = urlparse(url)
if parsed_url.netloc==google_hostname and parsed_url.path==search_path: if (parsed_url.netloc == google_hostname
and parsed_url.path == search_path):
# remove the link to google news # remove the link to google news
continue continue
if parsed_url.netloc==google_hostname and parsed_url.path==images_path: if (parsed_url.netloc == google_hostname
and parsed_url.path == images_path):
# images result # images result
results = results + parse_images(result) results = results + parse_images(result)
else: else:
@ -99,6 +107,7 @@ def response(resp):
# return results # return results
return results return results
def parse_images(result): def parse_images(result):
results = [] results = []
for image in result.xpath(images_xpath): for image in result.xpath(images_xpath):