Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d793c273 authored by asciimoo's avatar asciimoo
Browse files

[enh] engine types

parent c3b7ed86

examples/basic_engine.py

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ def response(resp): 
    '''post-response callback

    resp: requests response object

    '''

    return [resp.text]

    return [{'url': '', 'title': '', 'content': ''}]

searx/__init__.py

+0 −7
Original line number Diff line number Diff line 


base_result_template = """

<div class="result">

    <h3 class="result_title"><a href="{url}">{title}</a></h3>

    <p class="content">{content}<br />{url}</p>

</div>

"""

searx/engines/__init__.py

+8 −6
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import grequests 


engine_dir = dirname(realpath(__file__))



engines = []

engines = {}



for filename in listdir(engine_dir):

    modname = splitext(filename)[0]
@@ -16,14 +16,16 @@ for filename in listdir(engine_dir): 
    engine = load_source(modname, filepath)

    if not hasattr(engine, 'request') or not hasattr(engine, 'response'):

        continue

    engines.append(engine)

    engines[modname] = engine



def default_request_params():

    return {'method': 'GET', 'headers': {}, 'data': {}, 'url': ''}



def make_callback(results, callback):

def make_callback(engine_name, results, callback):

    def process_callback(response, **kwargs):

        results.extend(callback(response))

        for result in callback(response):

            result['engine'] = engine_name

            results.append(result)

    return process_callback



def search(query, request):
@@ -31,11 +33,11 @@ def search(query, request): 
    requests = []

    results = []

    user_agent = request.headers.get('User-Agent', '')

    for engine in engines:

    for ename, engine in engines.items():

        headers = default_request_params()

        headers['User-Agent'] = user_agent

        request_params = engine.request(query, headers)

        callback = make_callback(results, engine.response)

        callback = make_callback(ename, results, engine.response)

        if request_params['method'] == 'GET':

            req = grequests.get(request_params['url']

                                ,headers=headers

searx/engines/duckduckgo.py

+12 −7
Original line number Diff line number Diff line 
from lxml import html

from json import loads





def request(query, params):

    params['method']    = 'POST'

    params['url']       = 'https://duckduckgo.com/html'

    params['data']['q'] = query

    params['url'] = 'https://duckduckgo.com/d.js?q=%s&l=us-en&p=1&s=0' % query

    return params





def response(resp):

    dom = html.fromstring(resp.text)

    results = dom.xpath('//div[@class="results_links results_links_deep web-result"]')

    return [html.tostring(x) for x in results]
 
    results = []

    search_res = loads(resp.text[resp.text.find('[{'):-2])[:-1]

    for r in search_res:

        if not r.get('t'):

            continue

        results.append({'title': r['t']

                       ,'content': r['a']

                       ,'url': r['u']

                       })

    return results

searx/engines/duckduckgo_definitions.py

+6 −6
Original line number Diff line number Diff line 
import json

from searx import base_result_template



def request(query, params):

    params['url'] = 'http://api.duckduckgo.com/?q=%s&format=json&pretty=0' % query
@@ -10,10 +9,11 @@ def response(resp): 
    search_res = json.loads(resp.text)

    results = []

    if 'Definition' in search_res:

        if search_res.get('AbstractURL'):

            res = {'title'   : search_res.get('Heading', '')

                  ,'content' : search_res.get('Definition', '')

                  ,'url'     : search_res.get('AbstractURL', '')

                  }

        results.append(base_result_template.format(**res))

            results.append(res)



    return results