Commit graph

1177 commits

Author SHA1 Message Date
dalf
c4dd7c3a54 Merge branch 'master' of https://github.com/dalf/searx 2015-02-12 14:33:28 +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
dalf
1cf870c024 [fix] kickass engine : change the hostname to kickass.to (since kickass.so doesn't respond).
Close #197 perhaps not in clean way. Explaination :
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 begining 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 12:30:03 +01:00
Adam Tauber
f8a5f7d675 Merge branch 'Cqoicebordel-rtl' 2015-02-10 15:28:14 +01:00
Adam Tauber
df9cf9d09b Merge branch 'rtl' of github.com:Cqoicebordel/searx 2015-02-10 15:23:56 +01:00
Adam Tauber
c711212662 [fix] image proxify utf urls 2015-02-09 12:24:54 +01:00
Adam Tauber
67df3c516f Merge pull request #220 from pointhi/safesearch
Safesearch
2015-02-09 10:47:40 +01:00
Adam Tauber
5f801d7ea0 Merge pull request #219 from pointhi/new_engines
New engines: gigablast and blekko_images
2015-02-09 10:46:23 +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
Adam Tauber
7c075aa731 Merge branch 'master' of github.com:asciimoo/searx 2015-02-08 10:44:33 +01:00
Adam Tauber
9492b50070 [enh] fabfile to setup searx with uwsgi+nginx under debian based distros 2015-02-08 10:42:30 +01:00
Adam Tauber
91f7c031d5 [fix] handle proxied https scheme with uwsgi 2015-02-07 12:28:36 +01:00
Adam Tauber
590ffdb562 [doc] @glogiotatidis added to authors 2015-02-05 19:28:51 +01:00
Adam Tauber
6b8270a230 Merge pull request #213 from Cqoicebordel/travis
Stop running twice the tests on Travis
2015-02-04 11:53:03 +01:00
Adam Tauber
d2def30eea Merge pull request #212 from glogiotatidis/docker
Add Docker support.
2015-02-04 11:52:09 +01:00
Cqoicebordel
ccf3d80107 Stop running twice the tests on Travis 2015-02-03 20:16:24 +01:00
Giorgos Logiotatidis
0265e87e43 Add Docker support. 2015-02-03 20:43:08 +02:00
Adam Tauber
40ae8c8247 [enh] v0.7.0 2015-02-03 19:15:58 +01:00
Adam Tauber
ec45decc97 [doc] @Cqoicebordel promoted to major contributor 2015-02-03 19:14:15 +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
Adam Tauber
0e6f8393ab Merge branch 'Cqoicebordel-unit-tests' 2015-02-02 09:37:12 +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
Adam Tauber
4a20fc202e Merge pull request #207 from pointhi/hash_fix
[fix] hash error if url is including non ascii characters
2015-02-01 11:13:58 +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