zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity
2,034 Commits 5 Branches 17 Tags 71 MiB
Commit Graph

1655 Commits

Author SHA1 Message Date
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
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
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
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
Pydo 55a5b686ed Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration 
Resolved conflict searx/settings.yml
 2016-10-01 10:46:18 -04:00
Pydo 6f87bf2a1c Disabled seepeer.eu by default since it does not support https 2016-10-01 10:28:01 -04:00
Adam Tauber 812ade82b1 [fix] robot test engine names 2016-09-28 22:49:29 +02:00
Adam Tauber 86daef2063 [fix] do not allow underscore in engine names - closes #708 2016-09-28 22:30:05 +02:00
Adam Tauber bee7b497a3 [mod] rename "default" theme to "legacy" 2016-09-22 23:51:07 +02:00
marc d1d4ed4376 [fix] results with digbit don't truncate anymore 2016-09-20 16:11:33 -05:00
Eig8phei f90eb428c6 serve pages with HTTP/1.1 2016-09-15 14:47:09 +03:00
Lorenzo J. Lucchini 2bc42b378d Remove unrelated change that mistakenly ended up into this branch 2016-09-10 17:44:22 -04:00
firebovine e145fdb86d #607 - noapi fix 2016-09-10 17:43:12 -04:00
Lorenzo J. Lucchini 05206f86e3 Adding Urban Dictionary xpath engine 2016-09-10 17:42:19 -04:00
Lorenzo J. Lucchini a8907224a1 Improving Wolfram Alpha search hit content 
Making WA search hits contain
- the (parsed) input inside the "title" instead of just "Wolfram|Alpha", to better match other hit titles and to confirm correct parsing of input to the user
- the first output field that contains any text (skipping ones that are only pictures; this is usually the most meaningful "result" field) instead of the raw input as the "content", making it additionally possible to obtain WA computations from JSON API calls
 2016-09-10 17:42:19 -04:00
marc 09ee2aa69d [fix] Result text in Wolfram|Alpha (#607) 2016-09-10 17:42:04 -04:00
firebovine baeb3ff911 fix xpath expressions for urban dictionary 2016-09-10 17:08:34 -04:00
Adam Tauber 8d4dd3c515 [fix] 404 HTTP status on not found pages - closes #681 2016-09-07 08:32:01 +02:00
Adam Tauber ce371f766a [enh] version 0.10.0 
closes #659
 2016-09-06 18:31:25 +02:00
Adam Tauber ea19e19ff2 [enh] translation updates 2016-09-06 18:12:01 +02:00
Adam Tauber 3144ec1d59 [fix] unicode urls 2016-09-06 17:17:42 +02:00
potato 983415bc38 [enh] is_valid_lang moved to utils 2016-09-06 16:43:48 +02:00
potato b7d578ae80 [enh] engine header comments 2016-09-06 16:36:04 +02:00
potato 5ed9846bbf [fix] revert the port change 2016-09-06 16:35:12 +02:00
potato 8c72a22757 [enh] api_key usage, disable the engine by default 2016-09-06 16:12:34 +02:00
potato c051e6a2c3 [fix] pep8 2016-09-06 15:44:05 +02:00
potato ab471fd13b [enh] mymemory translated engine added for multi-word translations 2016-09-06 15:40:07 +02:00
potato 22bd39fd42 [fix] only 1-word search triggers the engine 2016-09-06 15:07:47 +02:00
potato 7bf1013c15 [enh] removed missing params; [fix] pep8 2016-09-06 14:24:08 +02:00
potato bc806bfab1 [fix] no lambda anymore, cgi.escape 2016-09-06 14:12:46 +02:00
potato 5416f0f248 [enh] dictionary engine renamed to dictzone 2016-09-06 12:50:56 +02:00
potato 84ff6e289e [enh] filter non-existing language code/name containing requests 2016-09-06 12:46:18 +02:00
potato b808a2e266 [fix] don't merge with suggestions 2016-09-06 12:37:26 +02:00
potato 3f4cc2146c [enh] return results instead of answers 2016-09-06 12:34:20 +02:00
potato 9d08c81f47 Merge branch 'master' of https://github.com/asciimoo/searx 2016-09-06 11:47:34 +02:00
potato f4525880ed [enh] dictionary engine added 2016-09-06 11:47:27 +02:00
Adam Tauber 55abf07a4f [fix] thread safe threaded_requests() function 2016-09-06 00:36:33 +02:00
Adam Tauber b816752719 [enh] more compact image results ++ fixed modal links 2016-09-06 00:26:32 +02:00
Adam Tauber 3a1b6fa818 [fix] replace modal-content class to prevent remote content load 
details: http://stackoverflow.com/questions/18378720/bootstrap-3-with-remote-modal
 2016-09-06 00:15:29 +02:00
Adam Tauber fa5bc3a563 [fix] use threading to recover after incomplete request crashes - closes #651 #662 2016-09-05 22:46:25 +02:00
Adam Tauber b27f07af23 [enh] socks proxy support 2016-09-05 22:35:54 +02:00
Adam Tauber da4f1c2512 [mod] truncate result content in html - closes #224 2016-09-05 22:22:25 +02:00
Adam Tauber 94b5f2ca77 [fix] result url wrap - closes #652 2016-09-05 21:57:49 +02:00
Adam Tauber 959497e26b [fix] remove trailing whitespaces 2016-09-05 21:56:19 +02:00
Pydo 41ce76e9c9 Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration 2016-09-05 14:56:53 -04:00
Pydo 2c2123b2e8 Added seepeer to config and added seepeer search parser 2016-09-05 14:51:02 -04:00
Adam Tauber 465d47283f [fix] 404 page localization #2 2016-09-04 19:07:07 +02:00
Adam Tauber c2f4d4449d [fix] 404 page localization 2016-09-04 18:38:25 +02:00
Adam Tauber b4b0231617 [fix] links in new tabs without js ++ noopener bug fix - closes #674 2016-09-04 15:57:43 +02:00
Adam Tauber 7591c8bfe3 Merge pull request #672 from kvch/self-info-paging 
Self information on later pages
 2016-08-27 22:10:33 +02:00
Adam Tauber 3043c404e4 Merge pull request #671 from kvch/custom-404 
Custom 404 message - fixes #317
 2016-08-27 22:08:58 +02:00
Noemi Vanyi aa227180e2 remove self info answers from pages after first one 2016-08-27 16:45:25 +02:00
Noemi Vanyi 0056c4035e add custom 404 page 2016-08-24 19:53:09 +02:00
Adam Tauber b72aec0a9b [fix] remove btdigg - see https://torrentfreak.com/btdigg-shut-down-due-to-torrent-spam-for-now-160711/ 2016-08-16 13:52:55 +02:00
Adam Tauber 32604be790 [fix] piratebay engine - using pirateproxy.red - see https://proxybay.tv/ 2016-08-16 10:44:00 +02:00
Adam Tauber f693a54ad7 Merge pull request #664 from kvch/uncapitalize-searx 
uncapitalize searx in templates
 2016-08-16 10:38:13 +02:00
Adam Tauber 13bed1f872 Merge pull request #639 from kvch/digbt-engine 
add digbt engine - fixes #638
 2016-08-16 10:37:17 +02:00
Noémi Ványi 4bd44cd98f uncapitalize searx in templates 2016-08-15 17:12:43 +02:00
David A Roberts 45120bc711 Add Hoogle search engine 2016-08-14 22:10:25 +10:00
David A Roberts 1e9dab08e6 [fix] behaviour for page_size>1 and first_page_num>0 
eg. pageno=1,21,41,... instead of 20,40,60,...
 2016-08-14 22:10:25 +10:00
David A Roberts 413e143707 [fix] don't merge results with distinct fragments 2016-08-14 22:09:29 +10:00
David A Roberts ee320d4e5b Online Etymology Dictionary 2016-08-14 19:25:29 +10:00
Noémi Ványi d320dd0efc diable digbt engine in settings.yml 2016-08-14 01:05:21 +02:00
Noemi Vanyi 3a1c5876b1 add digbt engine 
Unfortunately, it is quite slow so it is disabled.
Furthermore, the display of number of files is wrong
on digbt.org, so it is not displayed on searx.
 2016-08-13 16:19:00 +02:00
Adam Tauber 104cdb7d03 [fix] remove unused imports ++ int token timestamp by default 2016-08-13 01:13:41 +02:00
Adam Tauber eb57481450 [fix] google images paging - closes #571 2016-08-13 01:13:41 +02:00
David A Roberts 61fe5daf30 Add Microsoft Academic search engine 2016-08-12 20:19:10 +10:00
Adam Tauber 31866d9f33 Merge pull request #629 from stepshal/E305 
Add missing blank lines after class or function definition.
 2016-08-11 13:33:59 +02:00
stepshal 7e16c9d360 Add missing blank lines after class or function definition. 2016-08-11 17:18:12 +07:00
Adam Tauber 827aba4599 Merge pull request #658 from davidar/scroll 
[enh] infinite scroll
 2016-08-11 11:38:43 +02:00
David A Roberts 678b9e994a [enh] infinite scroll 
resolves #649
 2016-08-11 19:16:42 +10:00
Adam Tauber 4fae62cd88 Merge pull request #656 from cy8aer/openrepos 
openrepos: Meego/Sailfish application repository
 2016-08-11 11:04:55 +02:00
Adam Tauber 975bd5beb5 [fix] oscar grunt css build 2016-08-10 14:50:36 +02:00
David A Roberts 4ffe18b4bb [fix] delete trailing quote 2016-08-10 21:33:05 +10:00
David A Roberts 117d36b66e Add Crossref search engine and DOAI rewrite plugin 2016-08-10 11:15:30 +10:00
Noémi Ványi e7f93f4f12 set type of cursor to pointer in advanced search 2016-08-09 15:51:34 +02:00
Thomas Renard 9c18abfe5a openrepos: Meego/Sailfish application repository 2016-08-09 12:01:18 +02:00
Adam Tauber f1262ffa9e Merge pull request #588 from a01200356/wikidata 
[enh] More data from Wikidata
 2016-08-09 10:14:32 +02:00
Noemi Vanyi c59ef83353 redesign toggle button of engines && plugins 2016-08-07 23:25:27 +02:00
marc ad58b14be7 [fix] merge infoboxes based on weight 
also minor changes in attributes and images from wikidata
 2016-08-05 23:51:04 -05:00
marc c2e4014287 [fix] urls merge in infobox (#593) 
TODO:
    merge attributes
 2016-08-05 23:51:04 -05:00
marc a0a1284998 wikidata refactor and more attributes (see issue #560) 2016-08-05 23:51:04 -05:00
marc a4c77f88d0 [fix] exception if locale doesn't have a date format 
occitan, for example
 2016-08-05 23:51:04 -05:00
a01200356 93ef11adc0 [enh] multilingual wikidata 
disambiguation and tags are in local language

TOFIX:
    needs to query the api every time to know each label's name
 2016-08-05 23:51:04 -05:00
Adam Tauber c553523f5b Merge pull request #645 from dalf/remove_kickass 
[mod] remove the kickass engine from settings.yml
 2016-08-01 22:09:33 +02:00
Adam Tauber ffbee4bb82 [fix] collect garbage after searches to reduce memory footprint 2016-07-31 23:39:58 +02:00
Adam Tauber bf92aa3fdd [fix] wrap categories on small screens ++ some code formatting - closes #647 2016-07-27 02:08:24 +02:00
Adam Tauber 350a84520d [fix] time range detection 2016-07-26 00:28:48 +02:00
Adam Tauber 3a8d193d1f [mod] disable ddg by default - it just proxies yahoo/bing results: https://duck.co/help/company/yahoo-partnership 2016-07-26 00:08:42 +02:00
Adam Tauber 7d9c898170 Merge pull request #634 from kvch/advanced-search 
support time range search
 2016-07-26 00:06:16 +02:00
Noemi Vanyi 90e74fbb28 search on filter select 2016-07-25 23:40:31 +02:00
Adam Tauber 54d987636e [fix] do not load engines which cannot be initialized - closes #585 2016-07-25 23:36:52 +02:00
Noemi Vanyi 16a8641649 advanced-search: panel is visible when checked before 2016-07-25 23:30:48 +02:00
Noemi Vanyi 128b5245ab time range selection as dropdown 2016-07-25 23:30:48 +02:00
Noemi Vanyi e046c0d7ae add time range strings to be translated 2016-07-25 23:28:14 +02:00
Noemi Vanyi cddc9d3792 add 'Advanced settings' to strings to be translated 2016-07-25 23:28:14 +02:00
Noemi Vanyi a7c8d5882c fix pep8 2016-07-25 23:28:14 +02:00
Noemi Vanyi e7baf24ec1 add time range search for deviantart 2016-07-25 23:28:14 +02:00
Noemi Vanyi e9a78f1434 add time range search for google images 2016-07-25 23:28:14 +02:00
Noemi Vanyi f13b9fa36a add time range search for duckduckgo 2016-07-25 23:28:14 +02:00
Noemi Vanyi 2e5839503f add time range search for google 2016-07-25 23:28:14 +02:00
Noemi Vanyi 713d30400b add advanced settings to pointhi style 2016-07-25 23:28:14 +02:00
Noemi Vanyi 074521fd8a follow up changes in search_category_on_select 2016-07-25 23:26:26 +02:00
Noemi Vanyi 2e8ab34d76 add advanced settings for logicodev style 2016-07-25 23:26:26 +02:00
Noemi Vanyi 93c0c49e9a add time range search with yahoo 2016-07-25 23:19:46 +02:00
Adam Tauber 3a9c3fbd68 Merge pull request #644 from dalf/logicodev_fix 
[fix] close #637 : the search box doesn't overlap the menu.
 2016-07-25 18:50:47 +02:00
Harry Wood cd072676e9 moving a comma 2016-07-25 16:16:16 +01:00
Alexandre Flament bd4d904002 [mod] remove the kickass engine from settings.yml 2016-07-25 16:00:05 +02:00
Alexandre Flament e655e44133 [fix] close #637 : the search box doesn't overlap the menu. 2016-07-25 15:45:58 +02:00
Alexandre Flament 34835b77e2 [fix] Close #640 : remove MapQuest maps. Add in comment maps.wikimedia.org maps, see https://www.mediawiki.org/wiki/Maps 2016-07-25 15:28:25 +02:00
Noemi Vanyi ba590de7f1 [fix] deviantart engine xpaths 2016-07-19 09:37:02 +02:00
Adam Tauber aa09f963eb Merge pull request #621 from stepshal/anomalous-backslash-in-string 
Fix anomalous backslash in string
 2016-07-18 22:27:17 +02:00
Adam Tauber 21c5fb1c45 [fix] pep8 2016-07-17 00:03:22 +02:00
Adam Tauber a7260ac497 [fix] do not replace image href urls - closes #594 
These lines were added to fix a js image load issue (#535) what i cannot reproduce.
Hopefully we don't see it again
 2016-07-16 23:37:02 +02:00
Adam Tauber 5b5478bbd9 [fix] compute the order of results only once per search 2016-07-16 21:44:28 +02:00
Adam Tauber 485da54961 [mod][fix] use the average of results number ++ do not display smaller result number than the actual result count - closes #600 2016-07-16 21:44:17 +02:00
David A Roberts 144b7be70d Add Google Scholar search engine 2016-07-16 11:52:27 +10:00
Adam Tauber f7a3e9771d Merge pull request #615 from mmuman/scanr 
Add ScanR structures search engine
 2016-07-15 13:02:29 +02:00