kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-17 18:00:12 +01:00
Code
2,212 Commits 6 Branches 17 Tags 132 MiB
cf3a099c65
Commit Graph

1776 Commits

Author SHA1 Message Date
Alexandre Flament
7fdfeca3a4 [mod] add a __common__ template that can't be selected but that provides a common place for shared templates. 
What has been moved into this template :
* opensearch*.xml is always the same whatever the themes.
* the text inside */about.html
 2017-01-20 15:40:38 +01:00
Adam Tauber
57149661e4 Merge pull request #830 from davidar/se 
Semantic Scholar
 2017-01-18 23:50:11 +01:00
Adam Tauber
b1d49bacb0 Merge pull request #827 from davidar/spell 
[enh] show spelling corrections
 2017-01-18 23:49:01 +01:00
David A Roberts
7814d4b796 Semantic Scholar 2017-01-17 21:15:53 +10:00
David A Roberts
7492997c51 [fix] allow empty content 2017-01-17 21:14:33 +10:00
David A Roberts
1d30141c20 [enh] show spelling corrections 2017-01-16 13:31:16 +10:00
Alexandre Flament
7a16aca346 Merge branch 'master' into flask_perimeter 2017-01-15 22:18:20 +01:00
jcherqui
d98705bd06 Add 1337x icon 2017-01-15 16:13:23 +01:00
jcherqui
39a97825d9 Add torrent infos 2017-01-15 16:13:23 +01:00
jcherqui
4776abd1ac Remove categories 2017-01-15 16:13:23 +01:00
jcherqui
a320328dda Fix test 2017-01-15 16:13:23 +01:00
jcherqui
0549fb40d2 Add 1337x.to engine 2017-01-15 16:13:23 +01:00
Alexandre Flament
448903cd4a [fix] searching for "!google_images text" doesn't work (bang with underscore) 2017-01-12 16:17:29 +01:00
Adam Tauber
d6cbc6b78b [enh] 0.11.0 version bump 2017-01-10 21:09:04 +01:00
Adam Tauber
108392f8da [fix] skip non-complete google news results 2017-01-10 11:03:05 +01:00
Dalf
06bea82935 [mod] /config API : add language_support, paging, safesearch, supported_languages, time_range_support, timeout fields. 2017-01-07 14:42:55 +01:00
Adam Tauber
0d4da30c7f [enh] add instant answers to google engine 2017-01-05 17:20:12 +01:00
Adam Tauber
fc14fb0a67 [fix] french translation template var name 2017-01-05 15:47:54 +01:00
Adam Tauber
261015002e [enh] update translations 2017-01-05 15:24:45 +01:00
Adam Tauber
14b96b8824 [enh] propagate all search properties to the results page's components 2017-01-05 15:24:45 +01:00
Adam Tauber
627962ce40 Merge branch 'master' into flask_perimeter 2017-01-04 19:09:12 +01:00
Noémi Ványi
e8319fa2cb Revert "Merge pull request #793 from kvch/pics-modal" 
This reverts commit bff41987a4, reversing
changes made to d08108be62.
 2017-01-03 22:04:09 +01:00
Noémi Ványi
8af29d9797 Revert "Merge pull request #799 from kvch/modal-arrows" 
This reverts commit 79ceb13577, reversing
changes made to eaa0fb8102.
 2017-01-03 22:03:59 +01:00
Adam Tauber
7b1daf254e [fix] autocomplete unicode issue - closes #808 2017-01-03 13:11:38 +01:00
Adam Tauber
525e5d275c Merge pull request #801 from dalf/extract_text 
[fix] extract_text: use html.tostring instead html_to_text.
 2017-01-02 12:36:50 +01:00
Alexandre Flament
84a2c97a65 [mod] searx uses flask framework only in webapp.py. Make migration to another framework easier. 2017-01-02 12:06:04 +01:00
Alexandre Flament
90e1db3e5c [fix] extract_text: use html.tostring instead html_to_text. Fix #711 2016-12-31 13:56:09 +01:00
Adam Tauber
3d8c9bab96 Merge pull request #800 from dalf/searchpy5 
search.py : Fix and some minor modifications
 2016-12-30 19:51:12 +01:00
Adam Tauber
6bf9c398a7 [fix] use english as default language in bing 
If no language is specified, bing returns results with multiple languages
for one query which isn't really useful. Setting english as default
insted if nothing.
 2016-12-30 18:17:14 +01:00
Alexandre Flament
5a9551925d [fix] fix bugs introduced by commit 0a2fde19d0 from dalf/searchpy4 2016-12-30 18:10:14 +01:00
Alexandre Flament
28d51fd063 [mod] timeout in log are readable (the timeouts are compare to the start_time of the request). 2016-12-30 17:37:46 +01:00
Alexandre Flament
3a8ab5880a [mod] result_container.extend sets result['engine'] = engine_name for each result 2016-12-30 17:18:02 +01:00
Noémi Ványi
d18d09a98b [fix] change modal glyphicon arrows to image icons 2016-12-30 14:59:46 +01:00
Alexandre Flament
0a2fde19d0 [mod] add a search_one_request_safe function wrapper to call search_one_request. All exceptions are catched in this wrapper. 2016-12-30 11:51:49 +01:00
Noémi Ványi
1710043eb7 remove unnecessary media query && generated files 2016-12-29 23:40:23 +01:00
Noémi Ványi
420ef433ae add img pagination support of infinite scroll 2016-12-29 23:40:23 +01:00
Noémi Ványi
2ec6034c85 add modal window for pointhi style 2016-12-29 23:40:23 +01:00
Noémi Ványi
d82f64238f fix opening of result on new tab 2016-12-29 23:40:23 +01:00
Noémi Ványi
1157cefb1e add generated css of modal window 2016-12-29 23:40:23 +01:00
Noemi Vanyi
5fa6af648d add own pics modal window 2016-12-29 23:40:23 +01:00
marc
896c0c3734 revert language support column in preferences 2016-12-29 01:56:04 -06:00
marc
1175b3906f change language list to only include languages with a minimum of engines 
that support them.
users can still query lesser supported through the :lang_code bang.
 2016-12-29 01:55:30 -06:00
Adam Tauber
7388067f15 [fix] load engines with uwsgi too 2016-12-28 21:17:51 +01:00
Adam Tauber
116521192e [mod] display supported languages in preferences engine view 2016-12-28 21:01:19 +01:00
Adam Tauber
8bff42f049 Merge branch 'master' into languages 2016-12-28 20:00:53 +01:00
Adam Tauber
ea034fafa9 [fix] proper engine init 2016-12-27 17:55:44 +01:00
Adam Tauber
68cbf0448f [fix] do not reload engines twice if started with debug mode 2016-12-27 17:31:14 +01:00
Adam Tauber
a605377c40 [enh] explicit engine init 2016-12-27 17:31:14 +01:00
Adam Tauber
14f58bdaec [fix] robot tests ++ set default value for server http protocol version 2016-12-25 23:31:51 +01:00
Adam Tauber
a98bbefbcf [enh] configurable listening http protocol version 2016-12-25 23:05:01 +01:00
Stefan Antoni
89914e52e3 Update settings.yml 2016-12-25 22:04:45 +01:00
Stefan Antoni
e6d69b082f Merge branch 'master' into add_ccctv_to_settings 2016-12-25 14:59:52 +01:00
Adam Tauber
07448e15e4 [fix] disable etymonline by default - closes #789 2016-12-25 09:34:17 +01:00
Adam Tauber
b6fc154616 [enh] add searx engine 2016-12-24 22:23:36 +01:00
Stefan Antoni
96c8d36e7b Add ccctv engine to settings.yml 2016-12-24 16:44:12 +01:00
Adam Tauber
0171db5c3f [fix] handle missing images in google news 2016-12-23 12:59:52 +01:00
Adam Tauber
4b225eb7ef Merge pull request #661 from davidar/et 
Online Etymology Dictionary
 2016-12-23 12:54:02 +01:00
marc
f30d5e8793 [fix] supported languages column in preferences page 2016-12-16 22:17:41 -06:00
marc
7fba3d1179 Merge branch 'master' into languages 2016-12-16 22:14:36 -06:00
marc
4a1ff56389 minor fixes in utils/fetch_languages.py 2016-12-16 22:14:14 -06:00
Adam Tauber
19cd2bf3b5 [fix] re-enable ssl verification for searchcode 
closes #784
 2016-12-16 15:21:27 +01:00
Adam Tauber
cf5c7d050a [fix] engine setting if no categories specified 2016-12-15 11:59:21 +01:00
marc
af35eee10b tests for _fetch_supported_languages in engines 
and refactor method to make it testable without making requests
 2016-12-15 00:40:21 -06:00
marc
e0c270bd72 tests for language support in engines 2016-12-13 23:51:15 -06:00
marc
1b46ecd21a [fix] broken language selector 2016-12-13 21:36:40 -06:00
marc
93233c786a Refactor search language preference. 2016-12-13 20:59:31 -06:00
marc
f62ce21f50 [mod] fetch supported languages for several engines 
utils/fetch_languages.py gets languages supported by each engine and
generates engines_languages.json with each engine's supported language.
 2016-12-13 19:58:10 -06:00
marc
92c6e88ad3 small fixes 2016-12-13 19:56:59 -06:00
marc
727c287856 [fix] backwards compatibility with old language cookies 2016-12-13 19:56:58 -06:00
marc
922d51bf0c Add country names in language list. 2016-12-13 19:32:43 -06:00
marc
a11948c71b Add language support for more engines. 2016-12-13 19:32:43 -06:00
marc
a11230819f automatic search when language is selected 2016-12-13 19:32:00 -06:00
marc
c677aee58a filter langauges 2016-12-13 19:32:00 -06:00
marc
149802c569 [enh] add supported_languages on engines and auto-generate languages.py 2016-12-13 19:32:00 -06:00
Noémi Ványi
b034356825 add year filter to engines with time range support && tests 
Following engines does not support "Last year":
 * Bing News
 * DeviantArt
 * DuckDuckGo
 * Yahoo
 * YouTube (noapi)
 2016-12-11 16:58:31 +01:00
Noémi Ványi
c59c76e6ee add year to time range to engines which support "Last year" 
Engines:
 * Bing images
 * Flickr (noapi)
 * Google
 * Google Images
 * Google News
 2016-12-11 16:58:31 +01:00
Noémi Ványi
2fc1091b7f add "Last year" option to time range selection 2016-12-11 16:58:31 +01:00
Thomas Renard
16c40ffefd htmlize yacy contents 2016-12-11 14:05:07 +01:00
Noémi Ványi
9c8ec209e1 [mod] add timeout to gigablast 2016-12-11 11:58:49 +01:00
Noémi Ványi
553f3a3a1a fix xpath of yandex 2016-12-11 11:58:49 +01:00
Noémi Ványi
85f363774c fix habrahabr xpath 2016-12-11 11:58:49 +01:00
Noémi Ványi
c6ed0dae6c fix google play movies xpath 2016-12-11 11:58:49 +01:00
Adam Tauber
4676e1dcde [fix] remove result escaping from engine 2016-12-11 03:24:26 +01:00
Adam Tauber
1a82ed6f54 [mod] 500px rewrite 2016-12-11 03:22:42 +01:00
Adam Tauber
f6e9c074bb [fix] vimeo engine change follow-up 2016-12-11 02:33:04 +01:00
Adam Tauber
a2c94895c1 [fix] google news engine change follow-up 2016-12-11 01:03:52 +01:00
Adam Tauber
a764ebb4b1 [enh] extend json response with suggestions, infoboxes and answers 2016-12-10 21:38:34 +01:00
Adam Tauber
c3dcebb778 [fix] remove html tags from qwant results 2016-12-10 21:31:05 +01:00
Adam Tauber
be6ae81cb2 Merge pull request #776 from asciimoo/voat-engine 
add voat.co engine
 2016-12-10 00:49:16 +01:00
Adam Tauber
e12a137a2f [fix] unicode response in deezer and spotify 2016-12-10 00:30:34 +01:00
Adam Tauber
75aa46a6b3 [fix] remove unused variable 2016-12-10 00:15:53 +01:00
Adam Tauber
0205838f25 [enh] handle engine response crashes 2016-12-10 00:15:33 +01:00
Alexandre Flament
e48f07a367 Merge branch 'master' into searchpy2 2016-12-09 23:11:45 +01:00
Adam Tauber
d80fb2c8e8 [enh] central handling of empty result titles 2016-12-09 19:57:28 +01:00
Adam Tauber
72a217f983 [mod] return empty string on missing osm title 
Sometimes openstreetmap returns with None as title. In these cases use an empty
string instead.
 2016-12-09 19:53:54 +01:00
Adam Tauber
fdf63940e8 [fix] tests ++ flickr error 2016-12-09 19:11:22 +01:00
Adam Tauber
ef2ef7974a [enh] central html escaping of results 2016-12-09 19:10:33 +01:00
Adam Tauber
7e1f27e459 [enh] add author to image result content 2016-12-09 18:59:24 +01:00
Adam Tauber
39f5035e13 [fix] query escaping in rss/opensearch output 2016-12-09 18:59:24 +01:00
Adam Tauber
16bdc0baf4 [mod] do not escape html content in engines 2016-12-09 18:59:19 +01:00
Adam Tauber
28f12ef5a0 [fix] proper escaping of the search query in templates 2016-12-04 23:07:46 +01:00
Adam Tauber
7986d4cf41 [fix] correct path for autoscroll on non-root urls 
closes #758
 2016-12-04 11:17:17 +01:00
Noémi Ványi
3007e4e451 add voat.co engine 2016-12-02 20:34:00 +01:00
Adam Tauber
0724bd8168 [fix] pep8 2016-11-19 21:18:12 +01:00
Adam Tauber
7eed8a5dd9 [enh] add statistics answerer 2016-11-19 21:03:27 +01:00
Adam Tauber
971ed0abd1 [enh] add quick answer functionality with an example answerer 2016-11-19 20:53:51 +01:00
Adam Tauber
55dc538398 [mod] move load_module function to utils 2016-11-19 17:51:19 +01:00
Adam Tauber
827f9e41ca [fix] gettext requires request.preferences 2016-11-15 09:56:18 +01:00
Noémi Ványi
299c882304 search: make language configurable from settings.yml 2016-11-14 23:32:19 +01:00
Noémi Ványi
12c369e858 preferences: refactor to check consistently input values 2016-11-14 22:29:27 +01:00
Adam Tauber
a757c2f005 [fix] remove unused imports 2016-11-14 22:15:03 +01:00
Adam Tauber
832cf37a97 [enh] display errors 
also tried flask's flash feature but flask creates session cookies if it
isn't flushed. Avoiding session cookies to preserve privacy
 2016-11-14 22:07:23 +01:00
Adam Tauber
88dfee858e [fix] rewrite missing variable 2016-11-14 17:25:21 +01:00
Adam Tauber
96f182d75d [fix] allow empty autocomplete setting 
closes #756
closes #761
 2016-11-14 16:17:11 +01:00
Adam Tauber
43ddbc60da [fix] pep8 2016-11-14 16:09:16 +01:00
Adam Tauber
16f2e346b3 [fix] bing unicode issue part III. 2016-11-14 15:52:29 +01:00
Adam Tauber
94196c4b6c [enh] show traceback of search errors 2016-11-14 15:49:06 +01:00
Adam Tauber
1176505fa4 [fix] bing character encoding - closes #760 2016-11-14 15:47:42 +01:00
Adam Tauber
17b08d096c [fix] unicode search expression for bing 2016-11-07 22:33:17 +01:00
Adam Tauber
16ff8d06c7 [fix] bing paging and language support 
see https://msdn.microsoft.com/en-us/library/ff795620.aspx for bing
specific search operators

closes #755
 2016-11-07 22:30:20 +01:00
Alexandre Flament
219f047bf3 Merge branch 'master' into searchpy2 2016-11-06 09:44:07 +01:00
Adam Tauber
7d26b3f8f8 [fix] suspend end time check 2016-11-06 02:53:09 +01:00
Noémi Ványi
c7906555a0 add lobste.rs xpath engine 2016-11-06 01:17:30 +01:00
Alexandre Flament
01e2648e93 Simplify search.py, basically updated PR #518 
The timeouts in settings.yml is about the total time (not only the HTTP request but also the prepare the request and parsing the response)
It was more or less the case before since the threaded_requests function ignores the thread after the timeout even the HTTP request is ended.

New / changed stats :
* page_load_time : record the HTTP request time
* page_load_count: the number of HTTP request
* engine_time : the execution total time of an engine
* engine_time_count : the number of "engine_time" measure

The avg response times in the preferences are the engine response time (engine_load_time / engine_load_count)

To sum up :
* Search.search() filters the engines that can't process the request
* Search.search() call search_multiple_requests function
* search_multiple_requests creates one thread per engine, each thread runs the search_one_request function
* search_one_request calls the request function, make the HTTP request, calls the response function, extends the result_container
* search_multiple_requests waits for the the thread to finish (or timeout)
 2016-11-05 13:45:20 +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
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
Noémi Ványi
6334fca11c add version info to config endpoint 2016-10-30 15:58:34 +01: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
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
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
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