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

[mod] code formatting

This commit is contained in:
asciimoo 2013-11-15 19:28:30 +01:00
parent a192438e9a
commit ad7c83e3f6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
searx/webapp.py
View File

@ -69,6 +69,7 @@ def parse_query(query):
@app.route('/', methods=['GET', 'POST']) @app.route('/', methods=['GET', 'POST'])
def index(): def index():
global categories global categories
if request.method=='POST': if request.method=='POST':
request_data = request.form request_data = request.form
else: else:
@ -99,11 +100,13 @@ def index():
selected_engines.extend({'category': categ, 'name': x.name} for x in categories[categ]) selected_engines.extend({'category': categ, 'name': x.name} for x in categories[categ])
results, suggestions = search(query, request, selected_engines) results, suggestions = search(query, request, selected_engines)
for result in results: for result in results:
if len(result['url']) > 74: if len(result['url']) > 74:
result['pretty_url'] = result['url'][:35] + '[..]' + result['url'][-35:] result['pretty_url'] = result['url'][:35] + '[..]' + result['url'][-35:]
else: else:
result['pretty_url'] = result['url'] result['pretty_url'] = result['url']
if request_data.get('format') == 'json': if request_data.get('format') == 'json':
return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json') return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')
elif request_data.get('format') == 'csv': elif request_data.get('format') == 'csv':
@ -114,9 +117,10 @@ def index():
for row in results: for row in results:
csv.writerow([row[key] for key in keys]) csv.writerow([row[key] for key in keys])
csv.stream.seek(0) csv.stream.seek(0)
response = Response(csv.stream.read(), mimetype='application/csv', ) response = Response(csv.stream.read(), mimetype='application/csv')
response.headers.add('Content-Disposition', 'attachment;Filename=searx_-_{0}.csv'.format(query)) response.headers.add('Content-Disposition', 'attachment;Filename=searx_-_{0}.csv'.format(query))
return response return response
template = render('results.html' template = render('results.html'
,results=results ,results=results
,q=request_data['q'] ,q=request_data['q']
@ -126,6 +130,7 @@ def index():
) )
resp = make_response(template) resp = make_response(template)
resp.set_cookie('categories', ','.join(selected_categories)) resp.set_cookie('categories', ','.join(selected_categories))
return resp return resp
@app.route('/favicon.ico', methods=['GET']) @app.route('/favicon.ico', methods=['GET'])