diff --git a/engines.cfg_sample b/engines.cfg_sample index f4f398051..ef9a32f34 100644 --- a/engines.cfg_sample +++ b/engines.cfg_sample @@ -22,6 +22,10 @@ engine = duckduckgo_definitions engine = duckduckgo locale = en-us +[filecrop] +engine = filecrop +categories = files + [flickr] engine = flickr categories = images @@ -44,7 +48,7 @@ categories = images [piratebay] engine = piratebay -categories = videos, music +categories = videos, music, files [soundcloud] engine = soundcloud diff --git a/searx/engines/piratebay.py b/searx/engines/piratebay.py index 11538dd6b..9cf410106 100644 --- a/searx/engines/piratebay.py +++ b/searx/engines/piratebay.py @@ -9,6 +9,7 @@ url = 'https://thepiratebay.se/' search_url = url + 'search/{search_term}/0/99/{search_type}' search_types = {'videos': '200' ,'music' : '100' + ,'files' : '0' } def request(query, params): diff --git a/searx/static/css/style.css b/searx/static/css/style.css index 90db60d6b..868f2f813 100644 --- a/searx/static/css/style.css +++ b/searx/static/css/style.css @@ -25,7 +25,16 @@ body, #container { .row p { padding: 0 10px; max-width: 700px; } .row h3,ul { margin: 4px 8px;} -.hmarg { margin: 0 20px; } +.hmarg { + margin: 0 20px; + border: 1px solid #3498DB; + padding: 4px 10px; +} + +a:link.hmarg { color: #3498DB; } +a:visited.hmarg { color: #3498DB; } +a:active.hmarg { color: #3498DB; } +a:hover.hmarg { color: #3498DB; } .top_margin { margin-top: 60px; } @@ -113,9 +122,7 @@ tr:hover td { background: #DDDDDD; } .center #search_wrapper { margin-left: auto; margin-right: auto; } .q { background: none repeat scroll 0 0 #FFFFFF; - border: 1px solid #8D8D8D; - border-radius: 3px; - box-shadow: 1px 1px 2px #999999 inset; + border: 1px solid #3498DB; color: #222222; font-size: 16px; height: 28px; diff --git a/searx/static/img/searx.png b/searx/static/img/searx.png index 45037ee33..e162da502 100644 Binary files a/searx/static/img/searx.png and b/searx/static/img/searx.png differ diff --git a/searx/templates/about.html b/searx/templates/about.html index 977422c5d..931578b95 100644 --- a/searx/templates/about.html +++ b/searx/templates/about.html @@ -4,49 +4,52 @@

About searx

-

Searx is a metasearch engine inspired by the seeks-project. -
It tries to provide basic privacy by mixing your queries with those from others while avoiding storing search data. For all browsers (except chrom*) queries are made using a POST request. Thus they don't show up in our logs, nor in your url history. For Chrom* users there is an exception, searx is used from the search bar, it issues GET requests. -
You can add it to your browsers search bar and even make it your default search engine. +

Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users.

-

What makes searx different

+

Why use Searx?

+

If you do care about privacy, want to be a conscious user, moreover believe + in digital freedom, make Searx your default search engine or run it on your own server

-

Engines

+

Technical details - How does it work?

-{% for (categ,search_engines) in categs %} -

{{ categ.capitalize() }}

- -{% endfor %} -

Please add more engines to this list, pull requests are welcome!

+

Searx is a metasearch engine, +inspired by the seeks project.
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they don't show up in our logs, neither in your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests.
+Searx can be added to your browser's search bar, moreover it can be set as the default search engine. +

-

Running public instances

+

How can I have my own?

+ +

Searx appreciates your suspicion regarding logs, so take the code and run it yourself!
Add your Searx to this list to help other people to have privacy and make the Internet freer! +
The more decentralized the Internet is the more freedom we have!

+ +

FAQ

-

Trust

-

It's ok if you don't trust us regarding the logs, take the code and run it yourself! decentralize!

+

How to add to firefox?

Install searx as a search engine on any version of Firefox! (javascript required)

+

Developer FAQ

+

New engines?

Don't forget to restart searx after config edit!

-

WSGI support?

-

Okhin wrote a great and detailed article about the setup.

+ +

Installation/WSGI support?

+

See the installation and setup wiki page

+

How to debug engines?

Stats page contains some useful data about the used engines.

+
{% endblock %} diff --git a/searx/templates/engines.html b/searx/templates/engines.html new file mode 100644 index 000000000..1f52dc09f --- /dev/null +++ b/searx/templates/engines.html @@ -0,0 +1,26 @@ +{% extends 'base.html' %} +{% block content %} +
+

Currently used search engines

+ + + + + + + {% for (categ,search_engines) in categs %} + {% for search_engine in search_engines %} + + {% if not search_engine.private %} + + + + + {% endif %} + {% endfor %} + {% endfor %} +
Engine nameCategory
{{ search_engine.name }}{{ categ }}
+

Please add more engines to this list, pull requests are welcome!

+

back

+
+{% endblock %} diff --git a/searx/webapp.py b/searx/webapp.py index 6bd4e6097..bc534d36b 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -70,7 +70,8 @@ def get_base_url(): def render(template_name, **kwargs): global categories - kwargs['categories'] = sorted(categories.keys()) + kwargs['categories'] = ['general'] + kwargs['categories'].extend(x for x in sorted(categories.keys()) if x != 'general') if not 'selected_categories' in kwargs: kwargs['selected_categories'] = [] cookie_categories = request.cookies.get('categories', '').split(',') @@ -183,8 +184,13 @@ def index(): @app.route('/about', methods=['GET']) def about(): + return render('about.html') + + +@app.route('/engines', methods=['GET']) +def list_engines(): global categories - return render('about.html', categs=categories.items()) + return render('engines.html', categs=categories.items()) @app.route('/preferences', methods=['GET', 'POST'])