logo

searx

Unnamed repository; edit this file 'description' to name the repository.
commit: 5c8382c1ba46ddef8d58c01b7517a156b305635c
parent: 5351104244da929b18309fe868877fcd0a024517
Author: asciimoo <asciimoo@gmail.com>
Date:   Sun,  1 Dec 2013 23:52:49 +0100

[enh] favicon added

Diffstat:

searx/static/img/favicon.png | 0
searx/templates/base.html | 1+
searx/webapp.py | 17+++++++++++------
3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/searx/static/img/favicon.png b/searx/static/img/favicon.png Binary files differ. diff --git a/searx/templates/base.html b/searx/templates/base.html @@ -7,6 +7,7 @@ <meta name="keywords" content="searx, search, search engine, metasearch, meta search" /> <title>{% block title %}{% endblock %}searx</title> <link rel="stylesheet" href="/static/css/style.css" type="text/css" media="screen" charset="utf-8" /> + <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" /> {% block styles %} {% endblock %} {% block head %} diff --git a/searx/webapp.py b/searx/webapp.py @@ -17,10 +17,10 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2013- by Adam Tauber, <asciimoo@gmail.com> ''' +import os if __name__ == "__main__": from sys import path - from os.path import realpath, dirname - path.append(realpath(dirname(realpath(__file__))+'/../')) + path.append(os.path.realpath(os.path.dirname(os.path.realpath(__file__))+'/../')) from flask import Flask, request, render_template, url_for, Response, make_response from searx.engines import search, categories, engines, get_engines_stats @@ -28,6 +28,8 @@ from searx import settings import json import cStringIO from searx.utils import UnicodeWriter +from flask import send_from_directory + app = Flask(__name__) @@ -133,10 +135,6 @@ def index(): return resp -@app.route('/favicon.ico', methods=['GET']) -def fav(): - return '' - @app.route('/about', methods=['GET']) def about(): global categories @@ -172,6 +170,13 @@ def opensearch(): mimetype="application/xml") return resp +@app.route('/favicon.ico') +def favicon(): + print os.path.join(app.root_path, 'static/img'), 'asdf' + return send_from_directory(os.path.join(app.root_path, 'static/img'), + 'favicon.png', mimetype='image/vnd.microsoft.icon') + + if __name__ == "__main__": from gevent import monkey monkey.patch_all()