Commit Graph

1575 Commits

Author SHA1 Message Date
Adam Tauber
bd22e9a336 [fix] pep8 compatibilty 2016-01-18 12:47:31 +01:00
a01200356
c2e034f52a move two tests 2016-01-10 19:51:40 -06:00
a01200356
4130b3dfd6 Merge branch 'master' of https://github.com/asciimoo/searx
Conflicts:
	searx/tests/test_engines.py
2016-01-10 19:29:05 -06:00
Adam Tauber
39d2e0427f [fix] robot tests and pep8 check 2016-01-10 19:23:10 +01:00
Adam Tauber
53979a7bf7 [mod] remove buildout/makefile infrastructure 2016-01-10 19:23:10 +01:00
Adam Tauber
66f48c2bf5 [fix] google markup change - closes #489 2016-01-10 18:49:50 +01:00
a01200356
3bbdb23fd8 Merge branch 'master' of https://github.com/asciimoo/searx 2016-01-08 11:15:50 -06:00
misnyo
f86e212dba [fix]#485 AttributeError: 'module' object has no attribute 'old_where' 2016-01-06 19:37:20 +01:00
a01200356
8ca5744814 append link to result in wolframalpha_api (and the tests to validate that) 2016-01-05 21:47:31 -06:00
a01200356
2a15944b58 [fix] test in wolframalpha_noapi 2016-01-03 22:03:33 -06:00
a01200356
d997265e55 add tests for unicode strings in wolframalpha 2016-01-03 19:57:37 -06:00
a01200356
e5d51a0e98 Merge branch 'master' into wolframalpha 2016-01-03 16:00:05 -06:00
a01200356
576d37f256 [fix] unescape htmlentities in wolframalpha_noapi's answer 2016-01-03 15:58:01 -06:00
a01200356
16d6e758d7 [fix] flake8 compliance in test 2016-01-02 22:36:52 -06:00
a01200356
d05c676ed5 Add test case in wolframalpha_noapi
[fix] Display multiple answers in wolframalpha_api
2016-01-02 22:29:20 -06:00
misnyo
dc55d87e92 [fix]soundcloud.com guest client_id fetches dynamically 2016-01-02 13:06:02 +01:00
a01200356
19d025f0e7 [fix] pass wolframalpha_noapi tests 2016-01-02 01:49:32 -06:00
a01200356
e9d35c1309 update tests for wolframalpha 2016-01-02 00:41:14 -06:00
a01200356
0871c7ca85 [enh] wolframalpha appends result 2016-01-01 22:02:10 -06:00
a01200356
be54e5269a Add tests for the Wolfram Alpha engines (both API and NO API versions) 2015-12-30 00:53:15 -06:00
a01200356
5ed8f4da80 Make wolframalpha_noapi.py flake8 compliant 2015-12-29 21:37:48 -06:00
a01200356
d827fc49a1 Remove unnecessary code in wolframalpha_noapi engine
The answer is scraped from a js function, so parsing the html tree
doesn't achieve anything here.
2015-12-29 21:11:49 -06:00
a01200356
b51ba32f61 Wolfram Alpha (no API needed now) 2015-12-29 20:59:51 -06:00
misnyo
35a2bc5650 [fix] #471 #463 fix old openssl(<1.0.2) requests verify error 2015-12-29 19:42:16 +01:00
a01200356
0bb403bb47 More fixes (Travis again).
forfuckssaketravisnotagain
2015-12-28 01:24:26 -06:00
a01200356
5b0e785bbb Merge branch 'wolframalpha' 2015-12-28 01:19:11 -06:00
a01200356
bc2420f8d4 Fix Travis errors. 2015-12-28 01:17:42 -06:00
a01200356
9cd3017dcb Disable engine by default. 2015-12-27 22:39:55 -06:00
a01200356
1b7e80db03 Undo minor change. 2015-12-27 22:11:12 -06:00
a01200356
84cd09ac34 Merge branch 'master' into wolframalpha 2015-12-27 22:01:54 -06:00
a01200356
b3fde19ed5 Remove non API version (doesn't work) 2015-12-27 21:09:45 -06:00
a01200356
922565c8a9 Returns answer rather than results.
More appropriate in this case because it will always give just one
answer.
2015-12-26 22:26:59 -06:00
Thomas Pointhuber
b9a9abe10d [enh] improve gigablast engine
add language and safesearch support
2015-12-23 18:43:35 +01:00
GreenLunar
e01ef3bee1 Update link to documentation page 2015-12-23 10:31:25 +02:00
a01200356
4578575c28 Wolfie kinda works using API 2015-12-23 00:01:00 -06:00
Adam Tauber
371fc09b6f [enh] version 0.8.1 2015-12-22 23:21:12 +01:00
Adam Tauber
47b4a85fe3 [fix] gigablast https + url params 2015-12-22 20:25:57 +01:00
Adam Tauber
5cea4f9445 [fix] prevent google engine to redirect
nid/pref cookies are also removed
2015-12-22 20:05:42 +01:00
Adam Tauber
029291eca1 [fix] remove debug message 2015-12-22 20:00:31 +01:00
Adam Tauber
1f228c01cf Merge pull request #466 from GreenLunar/master
Update OpenSearch Description
2015-12-17 15:37:41 +01:00
GreenLunar
46bbea48f9 Update description 2015-12-17 15:25:09 +02:00
Adam Tauber
d8f8bdc951 [fix] quickfix for sometimes missing PREF cookie 2015-12-15 09:48:38 +01:00
Adam Tauber
8b155f78a5 [doc] correct google images docstring 2015-12-09 01:23:05 +01:00
Adam Tauber
439cf0559a [fix] replace the dead google images ajax api with a working one 2015-12-09 01:20:46 +01:00
GreenLunar
9a5aba393d Update description 2015-12-04 02:42:54 +02:00
GreenLunar
3d129823df Update description 2015-12-04 02:42:08 +02:00
GreenLunar
f8aba1cad8 Update description 2015-12-04 02:41:33 +02:00
Adam Tauber
911ed7987c Merge pull request #395 from gugod/master
btdigg engine: fix text mojibake.
2015-12-01 15:52:20 +01:00
Adam Tauber
786fe49fab Merge pull request #438 from Cqoicebordel/error_page_format
Don't throw away the request if pageno is wrong
2015-12-01 15:50:47 +01:00
Adam Tauber
bcfb9f8099 Merge pull request #437 from GreenLunar/patch-1
Update settings.yml
2015-12-01 15:48:46 +01:00
Kang-min Liu
ac8759cd3f Merge remote-tracking branch 'origin/master' 2015-11-14 00:05:44 +01:00
Kang-min Liu
c7c6c35ccd fix test faliures of btdigg engine.
This fix the test failures related to 01d2fb9f70
2015-11-14 00:02:36 +01:00
Adam Tauber
e98aef6fc4 [fix] yandex engine language support according to #430 2015-10-31 23:05:07 +01:00
Adam Tauber
4b8f9778fe [mod] yandex shortcut 2015-10-31 20:41:39 +01:00
Adam Tauber
fafc564874 [enh] yandex engine added 2015-10-31 15:27:23 +01:00
Adam Tauber
357fc47811 [fix] lock request pool generator 2015-10-31 14:40:59 +01:00
Adam Tauber
5d49c15f79 [fix] google engine - ignore new useless result type 2015-10-29 12:47:12 +01:00
Adam Tauber
a59d171385 [fix] answer result type 2015-10-26 14:22:59 +01:00
Thomas Pointhuber
4508c96667 [enh] fix content fetching, parse published date from description 2015-10-24 16:19:47 +02:00
Adam Tauber
a959977ab4 [fix] tests fix after result refactor 2015-10-23 23:31:53 +02:00
Adam Tauber
29dfd9679b [fix] use base_url in http redirects - closes #451 2015-10-23 23:07:36 +02:00
Adam Tauber
d2fd56612c [fix] rename after result refactor 2015-10-21 10:50:00 +02:00
Adam Tauber
d8ef98371b Merge remote-tracking branch 'remotes/origin/result-handling-refactor' 2015-10-16 12:27:15 +02:00
Adam Tauber
f1ac794a07 [fix] gigablast url params 2015-10-16 12:05:50 +02:00
Adam Tauber
5da78f7b37 [fix] bing news test mock 2015-10-16 12:01:35 +02:00
Adam Tauber
7aa9f4885a [fix] unicode decoding 2015-10-16 11:53:52 +02:00
Adam Tauber
66a70c6ae4 [fix] typo 2015-10-03 19:16:26 +02:00
Adam Tauber
5eabba2da1 [mod] list all engines of a result 2015-10-03 17:46:12 +02:00
Adam Tauber
b6c3cb0bdd [enh][mod] result handling refactor
Several changes has been made:
 - Parallel result merge
 - Scoring algorithm slightly changed (see result_score())
 - Proper Thread locking on global data manipulation
2015-10-03 17:26:07 +02:00
Adam Tauber
0ad272c5cb [fix] content escaping - closes #441
TODO check other engines too
2015-09-30 16:42:03 +02:00
Cqoicebordel
ed1daa32ea Don't throw away the request if pageno is wrong
Fix #424 but maybe only partially
2015-09-18 20:44:04 +02:00
GreenLunar
83c92a7471 Update settings.yml
Translated Hebrew
2015-09-18 12:04:49 +03:00
Cqoicebordel
a75d10206e Correct the loop through search engines
Fix #432
2015-09-17 18:18:48 +02:00
Adam Tauber
37c3ace309 [fix] add missing scheme to duplicated results too ++ revert gigablasts handling 2015-09-11 18:33:06 +02:00
Adam Tauber
e3df22b140 [fix] handle missing url scheme - fixes #428 2015-09-11 17:57:09 +02:00
Adam Tauber
23dab175b2 [enh] v0.8.0 2015-09-08 22:13:09 +02:00
Adam Tauber
6bcbd633a5 [fix] remove obsolete youtube engine 2015-09-08 22:10:41 +02:00
Adam Tauber
601389b673 [enh] add chinese locale 2015-09-08 21:15:40 +02:00
Adam Tauber
3213f20bc7 [enh] translation sync 2015-09-08 21:13:17 +02:00
Adam Tauber
d8ef944974 [enh] extend user agent versions 2015-09-08 11:12:15 +02:00
Adam Tauber
4184cece4a [fix] duckduckgo unicode url - #419 2015-09-07 23:13:04 +02:00
Adam Tauber
362c849797 [fix][mod] wikidata date handling refactor - fixes #387 2015-09-07 22:39:33 +02:00
Adam Tauber
7580852bda [enh] test utils.prettify_url 2015-09-07 19:22:01 +02:00
Adam Tauber
d5931874ac [fix] escape format string.. 2015-09-02 22:57:10 +02:00
Emmanuel Benazera
78a69e4c98 ddg encoding of URLs appears to be broken, revealed when trying to pickled the results to disk 2015-09-01 16:50:54 +02:00
Adam Tauber
f094188780 [fix] display categories of the selected engines 2015-09-01 15:21:17 +02:00
Adam Tauber
8c4d9b79d5 [fix] engine selection from url 2015-09-01 15:14:02 +02:00
Adam Tauber
604f32f672 [fix] bing unicode encode error - fixes #408 2015-08-28 14:51:32 +02:00
Adam Tauber
b9c8039d74 [mod] disable searchcode SSL verification (unable to get local issuer) 2015-08-25 22:56:45 +02:00
Adam Tauber
3f31e1ce6b [fix] piratebay tld according to wikipedia 2015-08-25 22:56:40 +02:00
Adam Tauber
42ac2c5b56 [fix] check empty engine language attribute - fixes subtitleseeker 2015-08-25 22:02:18 +02:00
Adam Tauber
28493d41a3 [fix] handle missing url in twitter results 2015-08-25 13:12:51 +02:00
Adam Tauber
c706bea788 Merge pull request #385 from framasoft/opensearch-icon
Add Image on opensearch
2015-08-25 09:21:40 +02:00
Thomas Pointhuber
996c96ffff [fix] block ixquick search url's 2015-08-24 11:31:30 +02:00
Thomas Pointhuber
23b9095cbf [fix] improve result handling of startpage engine 2015-08-24 11:28:55 +02:00
Thomas Pointhuber
5bffa9ca33 [fix] rewrite scheme to http if there is no one, FIX #390 2015-08-24 11:18:58 +02:00
Thomas Pointhuber
9cec9770be [fix] show debug output when enabled 2015-08-24 11:03:06 +02:00
Adam Tauber
3a8eafcc6b [fix] cookie parameter type 2015-08-12 15:49:48 +02:00
Adam Tauber
7c9f931baf [fix] type error 2015-08-02 20:41:44 +02:00
Adam Tauber
43cd8e0c41 [enh] default settings option to safe_search - #396 2015-08-02 20:32:32 +02:00
Adam Tauber
c1d9cfd9ae [enh] default settings option to autocomplete backend - #396 2015-08-02 20:32:32 +02:00
Adam Tauber
1fcf066a81 [mod] change settings file structure according to #314 2015-08-02 20:32:22 +02:00
Adam Tauber
d0830d4edf [enh] add settings option to set listening address - closes #397 2015-08-02 19:03:55 +02:00
Kang-min Liu
01d2fb9f70 btdigg engine: fix text mojibake.
Seeing on the official instance, searching with non-ascii character
usually renders mojibake non-sense:

    http://searx.me/?q=%E9%A3%9F%E5%A0%82&categories=files

Screenshot with broken: ![](https://imgrush.com/1NNr_Rpv-rt2.png)

Screenshot of the fixed rendering: ![](https://imgrush.com/khe4M2P3VAyq.png)
2015-07-19 20:44:02 +02:00
Luc Didry
57e618edf7 Add Image on opensearch 2015-07-09 23:05:45 +02:00
Adam Tauber
8d36a8b837 Merge pull request #333 from dalf/piratebay
[fix] Piratebay engine
2015-06-30 12:46:00 -04:00
Adam Tauber
4770d218b8 Merge pull request #377 from underr/master
Add portuguese translation
2015-06-30 11:49:44 -04:00
underr
7a13de7e19 Add portuguese translation 2015-06-25 18:49:07 -03:00
Niklas Haas
7144c94e26
[fix] reduce server traffic by optimizing images
Simply running ‘optipng’ on every PNG image reduces the overall size of
them by 10% on average.
2015-06-22 01:49:07 +02:00
Adam Tauber
0420ab3c80 [fix] shortcut added to ixquick 2015-06-21 17:53:42 +02:00
Adam Tauber
6424a7702d Merge branch 'remove_trackers_plugin' of https://github.com/Cqoicebordel/searx into Cqoicebordel-remove_trackers_plugin
Conflicts:
	searx/plugins/__init__.py
2015-06-21 16:56:00 +02:00
Adam Tauber
ff322d3373 [fix] debug message parameter 2015-06-21 16:50:42 +02:00
Cqoicebordel
8911233e3e Use parsed_url 2015-06-18 14:27:15 +02:00
Adam Tauber
2eb756c7aa [enh] add search tests 2015-06-16 19:56:16 +02:00
Adam Tauber
6ef7c3276c [fix] reverse proxy non-root url fix 2015-06-16 19:55:31 +02:00
Adam Tauber
b73ac15e49 [mod] disable qwant & swisscows by default to improve result quality 2015-06-16 18:40:11 +02:00
Cqoicebordel
e93f5314d7 A bit of cleanup of the code
- regexes in a array
- regexes applied only on the last part of the url
2015-06-15 20:34:02 +02:00
Adam Tauber
a9d92c3874 Merge pull request #371 from framasoft/add-useragent-plugin
Add a self user agent plugin
2015-06-15 09:42:01 -04:00
Luc Didry
0fe362bacf Change self plugin to self_info + change self_info description 2015-06-15 13:36:38 +02:00
Luc Didry
41fd748cdf Merge self_ip and self_useragent into one plugin 2015-06-15 10:22:37 +02:00
Luc Didry
538029dc14 Add a self user agent plugin
Just like with the "ip" query, duckduckgo gives the server's
information with the "user agent" query.
This corrects this behavior by adding a plugin based on self_ip.py plugin.
2015-06-14 21:08:38 +02:00
Cqoicebordel
0a1a3e7371 Add a bit of testing to improve coverage 2015-06-12 19:54:03 +02:00
Cqoicebordel
ab273e2faa Fix Vimeo engine.
Solve #368
2015-06-12 19:53:38 +02:00
Cqoicebordel
617495cca8 Add a plugin to remove trackers from results URLs 2015-06-09 16:16:07 +02:00
Adam Tauber
f2cbefeb54 Merge pull request #357 from asciimoo/google_engine
[enh] google engine : parse map links and more
2015-06-08 08:19:54 -04:00
Adam Tauber
fc1a8b25b8 Merge pull request #362 from Cqoicebordel/currency_chars
Allow use of chars as € in currency converter
2015-06-08 08:14:24 -04:00
Cqoicebordel
94567d99b3 Allow use of chars as € in currency converter 2015-06-07 15:38:38 +02:00
Dalf
ded3f98218 www1x engine: remove comment about unavailable https (https is working now) 2015-06-06 19:44:41 +02:00
Dalf
9e147d91f0 bing_images & www1x engines use https connections 2015-06-06 19:23:07 +02:00
Dalf
fc0ae0f907 google engine: code cleanup 2015-06-06 00:18:00 +02:00
Dalf
72c8de35a2 google engine :remove OSM map 2015-06-05 23:56:23 +02:00
Alexandre Flament
b8fc531b60 [enh] google engine : parse map links and more 2015-06-05 11:23:24 +02:00
Thomas Pointhuber
a8b75ca47b [enh] oscar template: using table instead of container-fluid to show cookies 2015-06-05 09:07:59 +02:00
Thomas Pointhuber
0978f10887 [fix] do not hide categorie inside preferences if there is no engine activated 2015-06-05 08:48:47 +02:00
Dalf
dafedbfc55 youtube_noapi uses searx.utils.list_get 2015-06-04 18:34:44 +02:00
Dalf
62cc2a5658 [fix] bing_news based on RSS output format 2015-06-04 18:30:08 +02:00
Adam Tauber
cdf931f949 Merge pull request #353 from Cqoicebordel/languages
New feature : language per search engine !
2015-06-03 11:41:02 -04:00
Cqoicebordel
00668dd0a1 New feature : language per search engine ! 2015-06-03 17:16:12 +02:00
Dalf
4e0f079a8c [fix] youtube_noapi : don't crash when there is no content 2015-06-03 10:12:30 +02:00
Adam Tauber
8ce6043859 Merge pull request #346 from Cqoicebordel/youtube
Adds engines : Youtube with or without API and multiple Qwant
2015-06-02 17:26:27 -04:00
Cqoicebordel
e0774c849c Removed the keywords from the settings in qwant engine 2015-06-02 22:11:47 +02:00
Cqoicebordel
f05087b93a Refactor
Use only one engine for the four search from Qwant
2015-06-02 20:36:58 +02:00
Dalf
9d10277c22 remove 'print' 2015-06-02 10:50:49 +02:00
Alexandre Flament
fb4df9d6c3 Merge pull request #349 from Cqoicebordel/startpage_autocomplete
Add startpage as an autocompleter engine
2015-06-02 10:43:10 +02:00
Cqoicebordel
633c7b6a5f Add startpage as an autocompleter engine 2015-06-01 20:45:18 +02:00
Adam Tauber
80fd392d69 Merge pull request #344 from asciimoo/google_engine
google engine
2015-06-01 07:54:21 -04:00
Thomas Pointhuber
2d81079384 [enh] implement image support for swisscows engine 2015-06-01 12:30:07 +02:00
Thomas Pointhuber
d923b2a420 [enh] implement swisscows engine, FIX #347
TODO: implement image engine
2015-06-01 11:04:01 +02:00
Cqoicebordel
884eeb8541 New Qwant engines
- Web
- Images
- News
- Social media
2015-06-01 00:00:32 +02:00
Cqoicebordel
f965c97822 Adds two engines : Youtube with or without API
The API needs an API_KEY
The NOAPI doesn't have the published dates.
2015-05-31 00:25:59 +02:00
Alexandre Flament
39ff21237c [enh] google engine : avoid some "sorry google" by adding another cookie : NID. This cookie is specific by hostname.
This allow to send request to google.* (according to the search language).
Before this commit, request in other languages than english was sent to www.google.com which was redirected to www.google.*
The PREF is still use on the www.google.com domain.
2015-05-30 17:41:40 +02:00
Alexandre Flament
484d0974f7 startpage and ixquick enignes : disabled by default, and timeout set to 6 seconds. 2015-05-30 13:36:10 +02:00
Alexandre Flament
6765823c56 [fix] set engine.safesearch to False if not defined 2015-05-30 12:37:18 +02:00
Alexandre Flament
d4d2dd9cb3 [enh] oscar theme: display engine response times in the preferences 2015-05-30 12:15:23 +02:00
Adam Tauber
e19eeeefa0 [fix] do not submit form if there is no search query - fixes #341 2015-05-27 23:26:24 +02:00
Adam Tauber
f79f6713b0 [fix] do not use category select js if there is no search query field on the page 2015-05-27 22:43:49 +02:00
Adam Tauber
021c8b2544 Merge pull request #335 from dalf/flickr
[fix] flickr engine
2015-05-27 15:21:46 -04:00
Alexandre Flament
7afd02c94e [fix] flickr engine 2015-05-27 13:49:25 +02:00
Alexandre Flament
36a08f2a6a [fix] piratebay engine (and disable it by default) 2015-05-27 12:35:45 +02:00
Alexandre Flament
3d70921175 [fix] bing_news 2015-05-27 12:08:50 +02:00
Adam Tauber
3035e14007 Merge pull request #320 from dalf/currency
[enh] currency_convert engine : "1 dollars in euros"
2015-05-24 15:09:49 -04:00
Adam Tauber
0cfe4fb09a [enh] romanian translation ++ translation updates 2015-05-19 18:58:27 +02:00
Adam Tauber
01bebc0c30 [enh] prettier search url display 2015-05-19 18:58:04 +02:00
Adam Tauber
b09aaf126e [mod] allow whitespaces in category/engine list 2015-05-19 11:16:57 +02:00
Alexandre Flament
5525625dae [enh] currency_convert engine: user can write "1 dollars in euros" instead of "1 USD in EUR".
The currency names are fetched wikidata and store into a static file : searx/data/currencies.json
This file is loaded when the currency_converter is loaded.
A database is perhaps more appropiated.
2015-05-12 20:52:08 +02:00
Adam Tauber
b6de23f540 [enh] cleaner category/engine selection from GET/POST param - closes #289 2015-05-12 08:21:39 +02:00
Adam Tauber
e34166168c Merge pull request #310 from dalf/yahoo_news
[fix] yahoo_news engine
2015-05-03 18:45:56 -04:00
Alexandre Flament
44ed4424f6 [fix] yahoo_news engine 2015-05-03 13:41:36 +02:00
Adam Tauber
3683b35877 [fix] plugin description 2015-05-02 23:54:38 +02:00
Adam Tauber
f1fc315318 [fix] robot test - kill the only subprocess 2015-05-02 20:59:50 +02:00
Adam Tauber
93fd1e4c76 Merge pull request #308 from dalf/versions_upgrade
update versions.cfg to use the current up-to-date packages
2015-05-02 14:58:32 -04:00
Adam Tauber
81850dd603 Merge pull request #309 from dalf/twitter
[fix] twitter engine
2015-05-02 13:45:38 -04:00
Adam Tauber
b3513aa3a6 Merge pull request #307 from dalf/master
[fix] Flickr engine
2015-05-02 13:39:13 -04:00
Adam Tauber
59a65d0bdc Merge pull request #305 from dalf/https_again
[enh] reduce the number of http outgoing connections.
2015-05-02 13:36:00 -04:00
Alexandre Flament
48cffb141b [fix] twitter engine 2015-05-02 18:20:12 +02:00
Alexandre Flament
4689fe341c update versions.cfg to use the current up-to-date packages 2015-05-02 15:45:17 +02:00
Alexandre Flament
59ee040424 [fix] remove a useless print 2015-05-02 15:28:08 +02:00
Alexandre Flament
65e6737413 [fix] google engine tests 2015-05-02 13:21:01 +02:00
Alexandre Flament
732ed952dc [fix] 1x.com tests 2015-05-02 13:09:18 +02:00
Alexandre Flament
e7fd546aae [fix] revert of 1x.com (no valid https certificate) 2015-05-02 13:02:42 +02:00
Alexandre Flament
6cd9a045f8 [fix] flickr engine 2015-05-02 12:36:49 +02:00
Alexandre Flament
f5d3b21566 [fix] user agent : the "rv:{version}" was missing (can be a issue with some engine, like flickr) 2015-05-02 12:35:57 +02:00
Alexandre Flament
78edc16e66 [enh] reduce the number of http outgoing connections.
engines that still use http : gigablast, bing image for thumbnails, 1x and dbpedia autocompleter
2015-05-02 11:43:12 +02:00
Alexandre Flament
8a69ade875 Revert of #195 when the search language is not english
Sometimes there is two requests to google (depending of the source IP) : one to google.com, the second to google.fr (for instance).

Going to https://www.google.com/ncr and saving the PREF cookie for future use prevent this (there is no redirection).

But, recently (or not ?), by doing this the search returns English results even if the Accept-Language is specified.

There is still a way to prevent this : going to preference, set the search language. I don't know if this can be done by searx.

For now, a quick fix is to disable the use of the PREF cookie when the search language is not English (google engine will slower but returns excepted results).
2015-05-01 21:20:09 +02:00
Adam Tauber
bbd83f5a51 Merge branch 'Cqoicebordel-oscar-cookies' 2015-04-26 20:17:00 +02:00
Adam Tauber
41e00e65a5 Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies
Conflicts:
	searx/templates/oscar/preferences.html
2015-04-26 20:14:40 +02:00
Adam Tauber
5c5ff19ec1 [fix] indentation 2015-04-26 20:09:28 +02:00
Adam Tauber
ad8611c755 Merge pull request #301 from dalf/https
engines: use https when possible
2015-04-26 13:37:11 -04:00
Alexandre Flament
043b269c6e [fix] tests 2015-04-26 19:23:06 +02:00
Alexandre Flament
8806002886 Merge remote-tracking branch 'origin/ssl' into https 2015-04-26 19:12:17 +02:00
Adam Tauber
18e7d60702 Merge pull request #298 from dalf/ssl
[fix] SSL : SNI support
2015-04-26 13:12:04 -04:00
Alexandre Flament
187617498a Log an error if the ndg-httpsclient, pyopenssl and pyasn1 packages are not installed.
See #298
2015-04-26 18:58:31 +02:00
Adam Tauber
ff68546c69 [mod] enable category select plugin by default 2015-04-26 18:57:03 +02:00
Adam Tauber
39f0cd94ee [fix] remove swapfile 2015-04-26 18:53:17 +02:00
Adam Tauber
5589f1a2bf Merge pull request #300 from dalf/patch-1
settings.yml clean up : remove locale
2015-04-26 12:34:01 -04:00
Adam Tauber
81479a9b60 Merge pull request #299 from dalf/noreferrer
Noreferrer
2015-04-26 12:30:17 -04:00
Adam Tauber
1f0e6ce65b Merge pull request #297 from dalf/proxies
[enh] Implement http proxies for outgoing requests. (see #236)
2015-04-26 12:19:15 -04:00
Alexandre Flament
99efd790c8 engines: use https when possible 2015-04-26 18:13:09 +02:00
Alexandre Flament
47b011829d settings.yml clean up : remove locale
locale was declared for bing* engines and vimeo.

  * bing* engines use the language settings.
  * vimeo uses neither locale nor language settings.

This avoid confusion
2015-04-26 17:35:31 +02:00
Alexandre Flament
ada5993f61 [fix] #264 : implementation using Referrer Policy (Editor’s Draft, 3 March 2015)
see http://w3c.github.io/webappsec/specs/referrer-policy/
2015-04-26 15:48:48 +02:00
Alexandre Flament
77b2fbb61e [enh] implements #264 : add rel="noreferrer" to external links 2015-04-26 15:32:26 +02:00
Alexandre Flament
2be52b74ad [fix] tests 2015-04-26 12:34:09 +02:00
Alexandre Flament
201928d2b0 [fix] SSL : SNI support 2015-04-26 12:04:29 +02:00
Adam Tauber
952473d297 Merge pull request #246 from Cqoicebordel/pix-arts
New theme !
2015-04-25 12:52:07 -04:00
Alexandre Flament
83e48fa89b flake8 fix 2015-04-25 12:05:35 +02:00
Alexandre Flament
cde37be4f5 [enh] basic support for http proxy (see #236) 2015-04-25 11:44:53 +02:00
Adam Tauber
33516256fd [fix] load https rules 2015-04-13 00:40:44 +02:00
Adam Tauber
d2a636f75d [mod] https rewrite pluginification 2015-04-13 00:30:12 +02:00
Adam Tauber
146928a749 [doc] plugin license infos 2015-04-13 00:08:04 +02:00
Adam Tauber
973c97c85b [enh] new plugin: search on category select (currently only in oscar theme)
TODO
purge mootools from default/courgette and integrate jquery ++ this theme
2015-04-12 19:27:48 +02:00
Adam Tauber
dd84814b68 [enh] plugins: client side dependency support 2015-04-12 19:24:01 +02:00
Adam Tauber
f59daa4a4b [fix] do not escape empty result content - closes #291 2015-04-12 17:37:01 +02:00
Adam Tauber
b2e026dde2 [mod] remove image proxy requests from the connection pool 2015-04-10 01:10:49 +02:00
Adam Tauber
9d11b36b5b [fix] timeout to autocompleters 2015-04-10 00:59:25 +02:00
Adam Tauber
6f73f4e7a4 [fix] ordered categories in preferences - closes #258 2015-04-07 18:09:38 +02:00
Adam Tauber
79b3de5185 [fix] test follow up 2015-04-07 16:28:29 +02:00
Adam Tauber
1cde92574f [mod] removing unavailable blekko engine 2015-04-07 12:06:10 +02:00
Adam Tauber
e1adf8f7b8 [fix] piratebay - cloudfare ssl errors 2015-04-07 12:06:07 +02:00
Adam Tauber
1184f45ca5 [enh] reset default preferences 2015-04-07 11:07:48 +02:00
Adam Tauber
54f1bc0425 [fix] call ip plugin as a post search callback 2015-04-07 11:07:46 +02:00
Adam Tauber
52d243f7af [fix] piratebay: missing torrent link 2015-03-29 21:05:43 +02:00
Adam Tauber
b8e9f5105c Merge pull request #274 from ldidry/fix-271
Fixes #271
2015-03-16 12:48:52 +01:00
Adam Tauber
a57a011e94 [fix] remove ip plugin pre_search override - closes #275 2015-03-16 12:48:53 +01:00
Luc Didry
7004de6aa7 Fixes #271
The opensearch method is now the method set in the preferences.

As before, POST by default and GET for Chrome/Chromium which doesn't
handle POST
2015-03-15 20:07:50 +01:00
Adam Tauber
22c4195c89 [fix] request args 2015-03-15 12:13:24 +01:00
Adam Tauber
f57149f912 [enh] plugin tests 2015-03-14 22:35:29 +01:00
Adam Tauber
bf5d6f56c6 [enh] plugin attribute type check 2015-03-14 20:22:26 +01:00
Adam Tauber
f7c18a04ac [mod] disable gigablast by default 2015-03-14 19:45:39 +01:00
Adam Tauber
13ea0a20ae [enh] gettext in self ip plugin 2015-03-14 19:45:15 +01:00
Adam Tauber
80ba6f22fa [fix] webapp tests 2015-03-11 21:23:28 +01:00
Adam Tauber
37c58fd9ca [enh] plugin preferences - server-side ++ oscar theme 2015-03-11 18:57:36 +01:00
Adam Tauber
9eeb36c787 [enh] selfip plugin description 2015-03-11 01:44:33 +01:00
Adam Tauber
9cb66be29c [enh] plugin id 2015-03-11 01:42:25 +01:00
Adam Tauber
359dfc5ebb [mod] checkbox macro 2015-03-10 23:03:06 +01:00
Adam Tauber
88aee611f7 [mod] merge GET, POST vars 2015-03-10 22:45:59 +01:00
Adam Tauber
cae22bfc76 [enh] per user plugin switch 2015-03-10 20:44:02 +01:00
Adam Tauber
00cc4dcbf4 [enh] plugin support basics ++ self ip plugin 2015-03-10 19:55:22 +01:00
Adam Tauber
8d1d4819ae [fix] whitespace remove and proper no-result warning display 2015-03-09 00:32:23 +01:00
Adam Tauber
d1b12f9016 [mod] search return value 2015-03-08 23:30:31 +01:00
Adam Tauber
4cc79533e7 [fix] deezer test with https 2015-03-03 11:44:12 +01:00
Adam Tauber
6379595e1f [mod] https in deezer engine - closes #262 2015-03-03 11:32:21 +01:00
Adam Tauber
c71ef5d230 Merge pull request #252 from dalf/master
[fix] btdigg: disable ssl check
2015-03-03 09:59:33 +01:00
Adam Tauber
98aa70cd41 Merge pull request #251 from Cqoicebordel/moar-engines
Moar engines
2015-02-22 23:29:13 +01:00
Adam Tauber
03579c225f [enh] support of multiple outgoing IPs 2015-02-22 23:24:49 +01:00
dalf
7cc5146c14 [fix] btdigg: disable ssl check,
avoid this error : SSLError: hostname 'btdigg.org' doesn't match either of 'ssl2000.cloudflare.com', 'cloudflare.com', '*.cloudflare.com'
2015-02-20 22:56:04 +01:00
Cqoicebordel
56ad00bc32 Correct a few UT 2015-02-20 19:03:09 +01:00
Cqoicebordel
aea0f866f6 Remove dead engines from config.
I didn't remove the engines files because it always could be helpful if they come back.
2015-02-20 18:50:30 +01:00
Cqoicebordel
a2a8fbf623 Add Spotify engine 2015-02-20 18:47:56 +01:00
dalf
57996b12fc [fix] update yahoo engine according to the web site changes 2015-02-20 12:34:13 +01:00
Cqoicebordel
6ee35145ca New Tab in preferences in Oscar to view Cookies
This tab only purpose is to allow to see what searx is storing on the user's computer.

At a later time, we could implement a way to delete those cookies.
2015-02-18 18:31:01 +01:00
Cqoicebordel
5c63f2a80a A bit of cleanup 2015-02-17 19:01:18 +01:00
Cqoicebordel
af100afb98 Change font 2015-02-17 18:50:57 +01:00
Cqoicebordel
e181041f11 Ajax loading + Tweaks of CSS 2015-02-17 01:07:14 +01:00
Adam Tauber
dc036ece85 [fix] russian translation syntax 2015-02-16 16:21:14 +01:00
Adam Tauber
028a73f178 [enh] russian translation update 2015-02-16 16:08:31 +01:00
Adam Tauber
bf31a270e5 Merge pull request #234 from dimqua/master
small update of russian translation
2015-02-16 16:07:55 +01:00
Adam Tauber
73e9a35851 Merge pull request #241 from Cqoicebordel/Remove-whitespace
Remove whitespace and allow autocompleter to work in sub folders
2015-02-16 15:58:34 +01:00
Cqoicebordel
f7b052c354 Allow autocompleter to work in a sub folder of the domain name. 2015-02-16 14:45:42 +01:00
Cqoicebordel
d740e7384a New Theme, Pix-art.
First commit
2015-02-15 19:09:17 +01:00
Cqoicebordel
bbb5e23551 Remove whitespace caused by Jinja commands
Adding this conf change will remove every newline created by a Jinja command (`{% %}`). It can save a bit of bandwidth.
2015-02-14 01:42:06 +01:00
Cqoicebordel
a20d09f76b Translations update 2015-02-13 18:28:35 +01:00
Adam Tauber
bf09daa31d [enh] log redirects 2015-02-13 13:02:37 +01:00
Adam Tauber
3ff269c84c Merge pull request #237 from dalf/master
[fix] close #197 for all engines
2015-02-13 12:21:38 +01:00
dalf
5029cb4787 [fix] close #197 for all engines 2015-02-13 11:17:00 +01:00
Cqoicebordel
77ba28cf50 Some RTL fixes
- Pull the suggestions to the right in oscar
- Add `&lrm;` to a few places to print good url
- Always LTR code display
- Order pref label and info in pref for mobile view

And add `sort` for ui languages and languages to find them more easily.
2015-02-13 01:03:18 +01:00
dimqua
f1a6522686 [enh] update russian translation 2015-02-12 23:34:03 +03:00
Adam Tauber
ec2516b93d Merge pull request #233 from dalf/master
[fix] kickass engine
2015-02-12 15:20:17 +01:00
dalf
9d537c0bad [fix] kickass tests 2015-02-12 14:50:41 +01:00
dalf
9db0bbc304 [fix] kickass engine : change the hostname to kickass.to (since kickass.so doesn't respond).
Close #197 perhaps not in clean way. Explanation :
In fact 301 responses are followed, except the hook is called for each HTTP response,
the first time for the HTTP 301 response then for HTTP 200 response.
Since the kickass engine excepts a real result, the engine crashes, AND the requests lib stops here.
Add a simple test at the beginning of the result function allows pass the first response and handle correctly the second response (the real one)

May be a proper way is to add this test in search.py ?

Code inside requests :
53d02381e2/requests/sessions.py (L579)
and line 591
2015-02-12 14:30:03 +01:00
Adam Tauber
f6db77d81e Merge pull request #210 from Cqoicebordel/unit-tests
unit tests
2015-02-12 10:52:55 +01:00
Cqoicebordel
b5cbbcede4 LTR the about page correctly 2015-02-12 02:02:30 +01:00
Cqoicebordel
d4ba97d00d Engine table in preference page in Courgette text-aligned to the right in RTL 2015-02-11 22:00:13 +01:00
Cqoicebordel
f4bdcc067f Real fix for preferences in RTL *and* in LTR 2015-02-11 20:53:06 +01:00
Cqoicebordel
3d5a4b091d Translate the 'cached' in results 2015-02-11 20:32:28 +01:00
Cqoicebordel
cec3ea77d5 Maps data must be LTR in RTL 2015-02-11 20:18:01 +01:00
Cqoicebordel
a4ae775e0f Preferences in the right order in RTL 2015-02-11 20:08:04 +01:00
Cqoicebordel
f96154b7c4 Google's unit test 2015-02-11 17:16:52 +01:00
Cqoicebordel
3f4d0053ee Import result_footer_rtl in video so it doesn't crash... 2015-02-11 15:58:59 +01:00
Thomas Pointhuber
6a0a693d6c [enh] add hebrew locale to searx 2015-02-11 15:04:05 +01:00
Thomas Pointhuber
0bdc79f45e [enh] add hebrew translation 2015-02-11 14:59:09 +01:00
Thomas Pointhuber
4b213ef4a2 [enh] update translations, regarding to #221 2015-02-11 14:19:06 +01:00
Adam Tauber
e43f61069a [fix] category name i18n - closes #221 2015-02-10 23:14:37 +01:00
Cqoicebordel
f703a77fc9 Photon's unit test
As in Flickr, a continue is not detected by coverage as covered but it is.
2015-02-10 18:44:49 +01:00
Adam Tauber
df9cf9d09b Merge branch 'rtl' of github.com:Cqoicebordel/searx 2015-02-10 15:23:56 +01:00
Cqoicebordel
8c2a5f0492 DDG Definitions' unit tests 2015-02-09 18:28:08 +01:00
Cqoicebordel
0a537d3b89 Yacy's unit test 2015-02-09 16:55:01 +01:00
Adam Tauber
c711212662 [fix] image proxify utf urls 2015-02-09 12:24:54 +01:00
Thomas Pointhuber
7ac6361b51 [enh] set google safesearch filter more restictive 2015-02-08 22:29:26 +01:00
Thomas Pointhuber
10666fd7c0 [enh] add safesearch to google_images 2015-02-08 22:15:25 +01:00
Thomas Pointhuber
832ea60e3d [fix] pep8, tests 2015-02-08 22:01:24 +01:00
Thomas Pointhuber
e7de9674b1 [enh] add safesearch functionality
2 = strict
1 = moderate
0 = none
2015-02-08 21:53:37 +01:00
Thomas Pointhuber
dd4686a388 [enh] add blekko_images engine 2015-02-08 14:49:46 +01:00
Thomas Pointhuber
04f7118d0a [enh] add gigablast engine 2015-02-08 14:12:14 +01:00
Cqoicebordel
fb04f76698 Faroo's unit test 2015-02-07 15:35:12 +01:00
Adam Tauber
91f7c031d5 [fix] handle proxied https scheme with uwsgi 2015-02-07 12:28:36 +01:00
Cqoicebordel
d0a1df881a Openstreetmap's unit test 2015-02-07 01:15:04 +01:00
Cqoicebordel
f1c10f4fe4 Startpage's unit test 2015-02-06 17:31:10 +01:00
Cqoicebordel
3a4d6045c1 Subtitleseeker's unit test 2015-02-06 16:39:59 +01:00
Cqoicebordel
9f13af8d3c Yahoo's unit test 2015-02-04 20:41:40 +01:00
Cqoicebordel
ff2ad57a87 Yahoo News' unit test 2015-02-04 20:07:26 +01:00
Cqoicebordel
d6e511fc2f Twitter's unit test
There is a commented line of a test that I didn't succed to make it work. It's an issue of unicode, utf-8, ascii, latin1... I think I tried everything, but if you have an idea... I'm still a newbie in python...
2015-02-04 19:39:31 +01:00
Cqoicebordel
a96208be96 Mediawiki's unit test 2015-02-03 19:56:26 +01:00
Adam Tauber
40ae8c8247 [enh] v0.7.0 2015-02-03 19:15:58 +01:00
Adam Tauber
996c797ab2 [fix] default blocked categories 2015-02-03 18:48:52 +01:00
Adam Tauber
1de781a143 [enh] category specific engine deactivation - closes #205 2015-02-03 18:37:38 +01:00
Adam Tauber
268e0516ee [fix] piratebay url change in tests 2015-02-03 00:27:40 +01:00
Adam Tauber
6be2065670 [fix] piratebay url 2015-02-03 00:21:25 +01:00
Cqoicebordel
1ea5bc63a5 Currency converter's unit test + DDG correction
Does anyone know how to trigger the except in the currency converter while still being matched by the regex ?
2015-02-02 18:39:50 +01:00
Cqoicebordel
efe6dead55 Duckduckgo unit test 2015-02-02 17:55:39 +01:00
Adam Tauber
7f865356f9 Merge branch 'unit-tests' of https://github.com/Cqoicebordel/searx into Cqoicebordel-unit-tests
Conflicts:
	searx/tests/test_engines.py
2015-02-02 09:36:43 +01:00
Cqoicebordel
5a16077455 PirateBay unit test + reactivation in Settings 2015-02-01 15:23:26 +01:00
Cqoicebordel
c6535dd65e Flickr Noapi unit test 2015-02-01 14:31:04 +01:00
Adam Tauber
03137eebd9 Merge pull request #208 from pointhi/new_engines
add 1x.com engine, improve yacy-engine
2015-02-01 14:07:34 +01:00
Thomas Pointhuber
a605d0ae69 [enh] add test for 1x.com 2015-02-01 13:52:43 +01:00
Cqoicebordel
8cf2ee5721 500px unit test 2015-02-01 13:43:10 +01:00
Adam Tauber
f18807955b [mod] python importable engine names 2015-02-01 11:55:47 +01:00
Thomas Pointhuber
7e30633edd [enh] improve yacy engine 2015-02-01 11:48:15 +01:00
Thomas Pointhuber
6042f2bc53 [enh] add 1x.com engine
* Deacivated by default, because of the big amount of results
2015-02-01 11:27:28 +01:00
Thomas Pointhuber
14079ea2b0 [fix] codec can't encode character inside image_proxify 2015-02-01 10:18:32 +01:00
Thomas Pointhuber
38302ef58b [fix] hash error if url is including non ascii characters 2015-02-01 10:07:53 +01:00
Adam Tauber
78828efdb0 [enh] allow override of blocked engines from query string 2015-01-31 23:11:48 +01:00
Adam Tauber
b19e681cce [enh] default disabled engines - closes #109 2015-01-31 23:11:45 +01:00
Adam Tauber
bfd321a7a9 [mod] python importable engine names 2015-01-31 22:05:13 +01:00
Cqoicebordel
04fa31b7f4 Vimeo's unit test 2015-01-31 19:49:54 +01:00
Cqoicebordel
d20ddf9da1 Stackoverflow's unit test 2015-01-31 17:29:22 +01:00
Cqoicebordel
787fee6a09 Soundcloud's unit test 2015-01-31 17:10:37 +01:00
Cqoicebordel
b7dc1fb9d5 Google news' unit test 2015-01-31 16:38:03 +01:00
Cqoicebordel
d5b8005ee1 Google images' unit test 2015-01-31 16:16:30 +01:00
Cqoicebordel
8ea749d6ec Kickass' unit test 2015-01-30 21:02:17 +01:00
Cqoicebordel
52a57ee045 Replace every bunch of whitespaces with only one space in HTML text 2015-01-30 21:00:49 +01:00
Cqoicebordel
a3d444ab85 BTDigg's unit test 2015-01-30 19:52:44 +01:00
Cqoicebordel
5761d6f0ab Bing news engine corrections
XPath *never* return None.

(I found the HTML report of coverage)
2015-01-29 21:19:59 +01:00
Cqoicebordel
efde2c21c8 Bing news' unit test
I have no idea why coverage tell 97% and 2 misses in branches. If anyone has an idea...
2015-01-29 20:56:57 +01:00
Cqoicebordel
dad0434f34 Bing images' unit test 2015-01-29 20:15:52 +01:00
Adam Tauber
8de97dac03 [mod] pretty url separation 2015-01-29 19:44:52 +01:00
Cqoicebordel
d495704551 Deviant Art's unit test 2015-01-29 01:13:33 +01:00
Cqoicebordel
1d255061c7 Digg's unit test 2015-01-29 00:26:12 +01:00
Cqoicebordel
92368a4107 Dailymotion's unit test 2015-01-27 23:20:57 +01:00
Cqoicebordel
3282e62ff9 Searchcode engines corrections 2015-01-27 22:39:25 +01:00
Cqoicebordel
0f81aa8410 Searchcode doc's test unit 2015-01-27 22:38:56 +01:00
Cqoicebordel
eca5de73a7 Searchcode code's test unit 2015-01-27 22:37:11 +01:00
Cqoicebordel
cfe81d741c A bit of utils unit tests 2015-01-27 20:03:33 +01:00
Adam Tauber
bac98a02cb [mod] reduce cookie expirity time - fixes #204 2015-01-27 20:00:17 +01:00
Adam Tauber
dafb49c804 [mod] update useragent versions 2015-01-27 19:58:39 +01:00
Adam Tauber
27efdf38c8 [fix] flickr-noapi logging ++ use correct image url - fixes #203 #181 2015-01-27 19:25:03 +01:00
Cqoicebordel
4dba3739fb Youtube's unit test 2015-01-26 18:24:08 +01:00
Cqoicebordel
8f040e30ad Flickr's test unit 2015-01-26 17:36:10 +01:00
Adam Tauber
78081baa8f [enh] always enable inner autocompletition (server side only) 2015-01-25 22:52:48 +01:00
Cqoicebordel
192f255e13 Mixcloud's unit test 2015-01-25 22:33:02 +01:00
Cqoicebordel
0f52cc7542 Deezer's unit test 2015-01-25 22:12:34 +01:00