Commit Graph

3096 Commits

Author SHA1 Message Date
Adam Tauber 51eafdd471 Merge pull request #733 from dalf/searchpy
Search architecture
2016-11-04 19:38:21 +01:00
Noémi Ványi e87fe383e4 generated files of parent 2016-11-04 18:40:49 +01:00
Noémi Ványi c2cf46092e docs: fix typos based on #653 2016-11-04 18:38:07 +01:00
Alexandre Flament 58a6c045c8 [mod] replace references request.request_data (GET or POST parameters) by request.form (based on merge of POST and GET parameters) 2016-11-02 14:52:22 +01:00
dalf fbb080f358 Change plugin API :
- pre_search(request, search)
- post_search(request, search)
- on_result(request, search, result)

with
- request is the Flask request
- search a searx.Search instance
- result a searx result as usual
2016-11-02 14:22:16 +01:00
dalf 67e11c42b9 Clean up the architecture
Purposes :
- isolate the plugins calls
- distinction between parsing the web request and running the search (Search class). To be able to test code easily, to run searx code outside a web server, to filter the search query parameters with plugins more easily, etc...

Details :
- request.request_data contains request.form or request.args (initialize inside pre_request() function)
- Query class is renamed RawTextQuery
- SearchQuery class defines all search parameters
- get_search_query_from_webapp create a SearchQuery instance (basically the previous Search.__init__ code)
- Search class and SearchWithPlugins class takes a SearchQuery instance as class constructor parameter
- SearchWithPlugins class inherites from Search class, and run plugins
- A dedicated function search_with_plugins executes plugins to have a well define locals() (which is used by the plugins code).
- All plugins code is executed inside the try...except block (webapp.py, index function)
- advanced_search HTTP parameter value stays in webapp.py (it is only part of UI)
- multiple calls to result_container.get_ordered_results() doesn't compute the order multiple time (note : this method was call only once before)
- paging value is stored in the result_container class (compute in the extend method)
- test about engine.suspend_end_time is done during search method call (instead of __init__)
- check that the format parameter value is one of these : html, rss, json, rss (before the html value was assumed but some text formatting wasn't not done)
2016-11-02 14:22:16 +01:00
Adam Tauber 142cd87095 [fix] menu style in pointhi oscar theme 2016-11-02 12:26:54 +01:00
Adam Tauber 9782633054 [fix] menu without js - closes #747 2016-11-01 23:12:46 +01:00
Adam Tauber e23c8f954b Merge pull request #746 from kvch/moar-time-range-support
Support time range search in more engines
2016-11-01 20:01:51 +01:00
Noémi Ványi 1490d6bc93 add time range search for flickr 2016-11-01 17:58:29 +01:00
Noémi Ványi 5c02b9ef31 add time range support for bing images 2016-11-01 17:58:29 +01:00
Noémi Ványi d2e0cbafb2 add time range search for youtube noapi 2016-11-01 17:58:29 +01:00
Noémi Ványi f70d405202 add time range search for bing news 2016-11-01 17:58:29 +01:00
Noémi Ványi e3d748ded4 show time range support in preferences 2016-11-01 17:57:58 +01:00
Adam Tauber 6243639f01 [mod] do not proxify images if image proxy is not set 2016-10-30 21:15:46 +01:00
Adam Tauber b30bc5eeeb Merge pull request #745 from kvch/version-info-in-config
add version info to config endpoint
2016-10-30 21:05:22 +01:00
Noémi Ványi 6334fca11c add version info to config endpoint 2016-10-30 15:58:34 +01:00
Adam Tauber d90e468769 Merge pull request #744 from kvch/gh-pages
add "How to protect an instance" section
2016-10-30 01:18:22 +02:00
Noémi Ványi 99026bb779 add generated files of parent 2016-10-30 01:02:58 +02:00
Noémi Ványi dca4d276a4 add sample config of filtron 2016-10-30 01:01:22 +02:00
Adam Tauber 1b9045ed89 [enh] use morty proxy for image proxification too if it is configured 2016-10-29 23:21:07 +02:00
Adam Tauber a67a4bf2c0 [enh] allow morty proxy without hmac key 2016-10-29 23:21:07 +02:00
Adam Tauber 574d9d40d2 Merge pull request #697 from Eig8phei/http1.1
serve pages with HTTP/1.1
2016-10-29 17:46:57 +02:00
dalf 3e7554422b [mod] the environment variable SEARX_DEBUG can override the general.debug value in settings.yml 2016-10-22 21:36:13 +02:00
Adam Tauber e249698b26 Merge pull request #737 from dalf/ixquick
[fix] ixquick : fetch results from ixquick.eu instead of ixquick.com
2016-10-22 21:33:25 +02:00
Adam Tauber dcf9380616 Merge pull request #736 from kvch/fix-images-infinite-scroll
[fix] images modal with infinite scroll
2016-10-22 21:32:51 +02:00
dalf 972f32d973 [fix] ixquick : fetch results from ixquick.eu instead of ixquick.com, close #727 2016-10-22 20:56:18 +02:00
Noémi Ványi db8c2ebc3f [fix] images modal with infinite scroll 2016-10-22 20:05:05 +02:00
Adam Tauber 760cb3c5af Merge pull request #734 from dalf/seeks_url
[fix] seeks URLS, close #731
2016-10-22 14:48:39 +02:00
Alexandre Flament a88768efd8 Merge branch 'master' into http1.1 2016-10-22 14:25:50 +02:00
Adam Tauber 85c7237a4f Merge pull request #728 from kvch/fix-kickass-torrents
fix kickass torrents engine
2016-10-22 05:40:28 +02:00
Noémi Ványi 53c9fde992 fix kickass torrents engine 2016-10-22 05:27:18 +02:00
Adam Tauber 218857999e Merge pull request #726 from mmuman/opensearch_shortname
[fix] set the title on the opensearch link tag
2016-10-22 05:10:49 +02:00
Adam Tauber 629fa4355a [fix] gecko driver cannot detect the page load finish on preferences form submit. It now works with this dirty workaround.. 2016-10-22 04:45:29 +02:00
Adam Tauber 684ceab1c3 [enh] add latest firefox addon to travis 2016-10-22 02:32:36 +02:00
Adam Tauber ecd2e1fac0 [fix] add missing gecko executable to travis 2016-10-22 02:23:03 +02:00
Adam Tauber 38883d6c7d [enh] update dev requirements 2016-10-22 02:22:20 +02:00
Adam Tauber d5c0dcd18a [fix] unicode url proxiing 2016-10-17 01:32:31 +02:00
Adam Tauber 1be6e72d51 [enh] add result proxy support - #707 2016-10-17 00:23:15 +02:00
Adam Tauber 19a6ca0b68 [enh] use HMAC for image proxy url verification 2016-10-16 23:41:33 +02:00
Alexandre Flament 5b21a7fb65 Merge branch 'master' into opensearch_shortname 2016-10-16 20:03:14 +02:00
dalf cae84e71a5 [fix] seeks URLS, close #731 2016-10-15 18:43:03 +02:00
Adam Tauber e2245611d7 Merge pull request #724 from Athemis/master
[engine] PDBe (Protein Data Bank Europe)
2016-10-13 11:19:11 +02:00
Alexander Minges 3c5883408c initial commit of pdbe engine
Adds support for queries to the Protein Data Bank Europe (PDBe).
2016-10-13 00:40:38 +02:00
François Revol 96cfdc77d2 [fix] set the title on the opensearch link tag
Firefox uses the title attributes instead of the ShortName from the xml file
as set in 0fbd7052 which closed #405
2016-10-09 01:12:56 +02:00
Adam Tauber 8b10eb6fe1 [enh] update certifi to the current latest 2016-10-03 14:10:00 +02:00
Adam Tauber e7d005c621 Merge pull request #677 from pydo/feature/seedpeer-engine-integration
Feature/seedpeer engine integration
2016-10-03 13:21:12 +02:00
Pydo beff8c6007 Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration 2016-10-01 19:26:51 -04:00
Pydo 01844b6f04 Set default categories for seedpeer provider 2016-10-01 19:22:36 -04:00
Adam Tauber dceb903114 [mod] disallow search results for robots 2016-10-01 20:22:52 +02:00