Commit Graph

2353 Commits

Author SHA1 Message Date
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
marc aac4ed6971 [fix] guess country code if not specified in duckduckgo engine 2016-07-14 16:36:52 -05:00
a01200356 8fc4b8156a [fix] multilingual duckduckgo
only works if both country and language are set
2016-07-12 23:44:39 -05:00
François Revol 1dba6dcbac Add ScanR structures search engine
In theory ScanR should also search for projects but the API is different,
so we'd need another engine.
2016-07-12 15:47:04 +02:00
stepshal b3ab221b98 Fix anomalous backslash in string 2016-07-11 23:53:13 +07:00
stepshal cd9b494cb5 Fix quantity of blank lines after code object. 2016-07-10 21:44:27 +07:00
François Revol b538de568a Add INA search engine 2016-07-09 22:09:54 +02:00
Adam Tauber fbbb307f2e [enh] add engine shortcut to config api 2016-07-07 09:27:34 +02:00
Adam Tauber 9f64fd6745 [enh] update useragent versions 2016-07-04 23:12:44 +02:00
Adam Tauber 257e52954a [enh][fix] update to latest dependencies ++ fix tests & travis test runner
WARNING: dependency changes
2016-07-04 22:46:43 +02:00
Noemi Vanyi c428f2d980 [fix] remove unecessary capitalize of name of instance 2016-07-02 16:48:58 +02:00
Adam Tauber 5924abd483 [fix] mobile navbar errors - closes #596 2016-06-28 21:17:33 +02:00
Adam Tauber 8ee32d5372 [fix] hide number of results if 0 2016-06-28 00:21:18 +02:00
Adam Tauber 2f7752b410 [enh] display number of results 2016-06-28 00:06:50 +02:00
Adam Tauber 36c8977390 [fix] rtl result template 2016-06-27 23:52:24 +02:00
Adam Tauber 1ee2a3d25d [mod] more compact logicodev skin 2016-06-26 14:34:08 +02:00
Adam Tauber 0c9c063141 [fix] result url block selection 2016-06-26 14:13:03 +02:00
Adam Tauber 7013c3dc0d [fix] logo responsivity ++ preferences button hover 2016-06-26 14:12:35 +02:00
Adam Tauber f496dc353d [enh] oscar theme redesign added
The original code made by @logico-dev (#559)
2016-06-26 01:57:43 +02:00
Adam Tauber 237d251d14 [fix] save unknown preferences parameters to cookies
Without this courgette color selector can not work
2016-06-26 01:44:42 +02:00
Adam Tauber 5dd2340bc6 [fix] gigablast redirect - closes #575 2016-06-12 00:07:54 +02:00
Adam Tauber 71d57df9d5 [fix] geektimes xpath - #575 2016-06-12 00:07:54 +02:00
Noemi Vanyi d43d9727a3 [enh] add server_settings call - closes #566 2016-06-11 00:20:09 +02:00
Noemi Vanyi 465fcfb9bd add archive.is xpath engine 2016-06-08 23:23:36 +02:00
Adam Tauber 27218b85fa [fix] missing import 2016-06-07 21:43:24 +02:00
Adam Tauber 2caf0d4c9a [enh] version 0.9.0 - #529 2016-05-24 13:35:52 +02:00
Adam Tauber bd361e60d8 Revert "use ngettext for plurals" 2016-05-24 12:49:21 +02:00
Adam Tauber ebc0bcb612 Merge pull request #551 from mikhirev/master
use ngettext for plurals
2016-05-19 15:52:23 +02:00
Adam Tauber bf1eebb17f Merge pull request #549 from guyou/feature-pool-fine-tuning
Use new settings to fine tune the connection pool
2016-05-19 15:51:14 +02:00
Dmitry Mikhirev 242c9ba756 3 plural forms in Russian 2016-05-11 01:59:36 +03:00
YuLun Shih 7364455d1f Fix 'set' object does not support indexing 2016-05-04 22:14:04 +08:00
Maxqia 56e53c9297 [fix] currency_convert: make unit tests pass
also make regex more efficent and normalize 's'es
2016-05-03 18:59:30 -07:00
Guilhem Bonnefille d571a9d204 Preset new values with defaulting values from code 2016-05-02 19:36:55 +02:00
Guilhem Bonnefille 3f395304f9 Fix pep8 2016-05-02 19:25:09 +02:00
Dmitry Mikhirev 921720563c update .po files 2016-05-02 12:58:34 +03:00
Dmitry Mikhirev 6d1d8a8f8d use ngettext 2016-05-02 12:36:54 +03:00
Maxqia fe2ce83e41 [enh] currency_convert: allow strings like google's "convert 1 euro to dollars" 2016-04-30 20:48:15 -07:00
Guilhem Bonnefille f18a3a77ef Use new settings to fine tune the connection pool
In some circumstances, it is necessary to increase size of pool.
2016-04-28 14:05:01 +02:00
Kirill Isakov c12e41a80f Fix result selection for top & bottom scrolling 2016-04-24 21:18:27 +06:00
Kirill Isakov 7b48a66350 Add auto page scrolling to selected result 2016-04-24 21:04:53 +06:00
Kirill Isakov 0d6625e070 Add search result navigation support 2016-04-24 18:01:02 +06:00
Kirill Isakov 1faf1b645b Set vim-hotkeys help panels to same height 2016-04-24 03:02:33 +06:00
Kirill Isakov 3246541bdc [WIP] Add vim-hotkeys plugin 2016-04-23 22:26:02 +06:00
Thomas Pointhuber 1833a8b1b8 [fix] use old system if there is no img_src 2016-04-21 15:13:26 +02:00
Thomas Pointhuber 63d68c8e0f [enh] add img_src to default result template 2016-04-21 15:10:08 +02:00
a01200356 a44faa7716 [fix] compile regex in ddg_definitions 2016-04-19 12:46:15 -05:00
a01200356 6dca14e95d [enh] multilingual duckduckgo_definitions 2016-04-17 16:34:46 -05:00
a01200356 8d335dbdae [enh] wikipedia infobox
creates simple multilingual infobox using wikipedia's api
2016-04-17 16:22:19 -05:00
Kirill Isakov 4eeb5fb76b [fix] incorrect URLs in Reddit results - closes #538 2016-04-16 16:22:31 +06:00
Adam Tauber 2661c3ab21 [mod] disable nyaa anime engine by default 2016-04-14 11:13:51 +02:00
Adam Tauber 85c0351dca Merge pull request #526 from ukwt/anime
Add a few search engines
2016-04-14 10:59:31 +02:00
Kirill Isakov 90c51cb449 Fix a few typos in Google search engine 2016-04-13 23:04:53 +06:00
Kirill Isakov d54e82dfb9 Revert to using random UA in Reddit search engine 2016-04-13 22:06:00 +06:00
Adam Tauber 5544fdb756 Merge pull request #531 from guyou/add-doku-engine
Add doku engine
2016-04-12 13:54:12 +02:00
Adam Tauber 11c2262055 Merge pull request #536 from kvch/general-minor-refactors
General minor refactors
2016-04-12 13:53:31 +02:00
Adam Tauber d27f7a1b07 [fix] clear image link if javascript enabled - closes #535 2016-04-10 02:24:00 +02:00
Guilhem Bonnefille 51cb832601 Comment out ubuntu-fr as it is not a general search engine 2016-04-09 22:21:25 +02:00
Noemi Vanyi adb1169fa3 add description to a var that seems to be unused 2016-04-09 19:49:59 +02:00
Noemi Vanyi 7daf98933d follow up blocked_engines renaming in templates 2016-04-09 19:49:59 +02:00
Noemi Vanyi 5867e97966 more follow ups in new preferences 2016-04-09 19:49:59 +02:00
Noemi Vanyi 8c4db08443 rename blocked engines to diabled engines 2016-04-09 19:49:59 +02:00
Noemi Vanyi 006841c4ff minor grammar fix in error message 2016-04-09 18:02:12 +02:00
Noemi Vanyi 1805cfd20a sort languages properly 2016-04-09 18:02:12 +02:00
Adam Tauber bb6dae1e42 [fix] user data check 2016-04-09 17:43:00 +02:00
Noemi Vanyi fe691a0988 new preferences handling
Preferences class was introduced in order to handle user preferences. Right now
it parses cookies and the form in preferences. Also it can retrieve settings
based on the name of the setting.

ATTENTION
Please note that engine preferences are handled differently from now on. So it
introduces incompatible changes. Every user who has saved preferences should reset and
save his/her settings again.

This change was needed, because everytime a default disabled engine was
added saved user preferences would broke. Now engine setting tracking is
fixed.
2016-04-09 01:08:44 +02:00
Adam Tauber 9331fc28a8 [fix] broken google images parsing 2016-04-07 08:07:17 +02:00
Guilhem Bonnefille 2733a92383 Fix query encoding 2016-04-05 13:31:49 +02:00
Guilhem Bonnefille f26f0dab2e Fix pep8 E302
Cf. http://legacy.python.org/dev/peps/pep-0008/#blank-lines
2016-04-04 13:38:22 +02:00
Guilhem Bonnefille f2d1a530fb Add ubuntu-fr wiki with new doku engine 2016-04-03 22:05:03 +02:00
Guilhem Bonnefille cf09b500f3 Add support for dokuwiki engine 2016-04-03 22:03:41 +02:00
Adam Tauber 5cbe4c5332 [fix] try to decode url - closes #527 2016-03-30 15:47:49 +02:00
Kirill Isakov d0001f10e6 Add searx user agent to Reddit engine request to comply with API usage terms 2016-03-30 17:30:46 +06:00
Adam Tauber fff9460238 Merge pull request #522 from jibe-b/master
add BASE engine in category "Science"
2016-03-30 11:09:22 +02:00
a01200356 94cb3a7f11 [enh] multilingual autocomplete
implemented for wikipedia, qwant and google
2016-03-29 19:10:13 -06:00
jibe-b 0b90cd42e2 minor update 2016-03-29 16:18:46 +02:00
jibe-b 092e15cc1d [enh] Add BASE engine in category Science. Basic and advanced search. 2016-03-29 16:17:17 +02:00
Kirill Isakov 0bfbdff234 Add Habrahabr & Geektimes search engines 2016-03-28 22:33:56 +06:00
Kirill Isakov 5b3c9f06eb Add BitBucket & GitLab search engines 2016-03-28 20:08:34 +06:00
Kirill Isakov bacc9a3df1 Add paging support to XPath & Erowid engines 2016-03-28 19:15:03 +06:00
Kirill Isakov e202c6fbec Fix PEP8 warnings for Nyaa.py 2016-03-27 05:23:17 +06:00
Kirill Isakov a8832574fa Shorten content field for very long Reddit search results 2016-03-27 05:09:04 +06:00
Kirill Isakov 80813c3e05 Add Erowid search engine 2016-03-27 04:29:23 +06:00
Kirill Isakov c1d456b136 Add F-Droid search engine 2016-03-27 03:50:44 +06:00
Kirill Isakov 547b8a8765 Add Tokyo Toshokan search engine 2016-03-27 00:49:57 +06:00
Adam Tauber 71de593a5b [fix] bing images page change 2016-03-26 02:07:52 +01:00
Kirill Isakov 7fbc12ee4e Add Torrentz.eu search engine 2016-03-26 05:28:58 +06:00
Adam Tauber 6d55642ab4 [fix] no more redirect ++ explicitly specify search language to avoid googles ip based heuristics 2016-03-25 18:38:02 +01:00
Kirill Isakov d026a97e42 Add Reddit search engine 2016-03-25 19:30:32 +06:00
Kirill Isakov 8b7dc2acb9 Remove content field from ArchWiki results; reformat code in archlinux.py
Content field in Arch Wiki search results is of no real use, more often
than not it contains no usable information and includes too many markup
tags which make the text unreadable. It is safe to remove it.
2016-03-25 00:38:48 +06:00
Kirill Isakov e5677ae6b6 Add Nyaa.se search engine 2016-03-25 00:24:37 +06:00
Kirill Isakov d748b8419a Add Arch Linux Wiki search engine 2016-03-24 01:57:27 +06:00
a01200356 751c9a346e [fix] duckduckgo's xpaths changed
test_duckduckgo modified to reflect changes in duckduckgo's html
2016-03-21 20:19:13 -06:00
Adam Tauber 0f518e489e [fix] csv results filename encoding 2016-03-16 10:43:28 +01:00
Adam Tauber e893d94185 [fix] docs url mod to prevent http redirect 2016-03-04 14:55:06 +01:00
Adam Tauber 6130f9a59f Merge pull request #473 from GreenLunar/patch-2
Update link to documentation page
2016-03-04 14:52:23 +01:00
Adam Tauber 667f7fde39 Merge pull request #516 from pointhi/translation-fix
Translation fix
2016-03-02 17:21:22 +01:00
Thomas Pointhuber 9a94b36593 [fix] translate plugin name and description in template 2016-03-02 17:16:46 +01:00
Thomas Pointhuber b8d1081756 [enh] reorder locales by alphabet, add english lanuage name in brackets 2016-03-02 16:41:56 +01:00
Thomas Pointhuber 2a1ddede5d [enh] update translation and add new languages
add new languages:
* bg
* el_GR
* eo
* pt_BR
2016-03-02 14:52:15 +01:00
Alexandre Flament 6ab91515df [enh] autocompletion : add qwant 2016-03-02 19:54:06 +08:00
Adam Tauber bc81eda64b [fix] opensearch image issue - closes #507 2016-03-02 11:52:11 +01:00
a01200356 8f3b33de23 [fix] remove unnecesary async calls in wolframalpha_noapi
setting async to false in the request did the job, lol.
2016-02-28 02:05:52 -06:00
a01200356 4cea71e3bb [fix] merge with 79705450df 2016-02-28 01:04:29 -06:00
a01200356 4d8996eb4d [enh] unit tests for wolframalpha 2016-02-28 00:47:36 -06:00
a01200356 4267b11a45 [fix] apply changes in infobox's styles
changes were made for wolframalpha infobox:

    - wrap text inside infobox.
      for example, there's a hill in New Zealand called
      Taumatawhakatangihangakoauauotamateapokaiwhenuakitanatahu
      (don't blame me, blame the Kiwis)
      and now it doesn't break the infobox.

    - add an optional image field for infobox's attributes.
      (doesn't affect ddg infobox at all)

    - table is now always split in half.
      needed so that images stay inside infobox.
      (max-width doesn't work for inline elements, it's the table
      that has to set the width.

if you don't like how the table width looks now in ddg/wiki's infobox,
i can change that code so that the style only applies when using
wolframalpha.
2016-02-27 19:19:04 -06:00
a01200356 78d3f3d6b1 [enh] infobox for wolframalpha
TODO:
    - infobox styles
    - unit tests

ISSUES:
    - no_api version needs to re-call server for additional pods, such
      as plots. therefore, it's even slower than before. comment out the
part that calls get_async_pod if requests reach timeout or increase
timeout in settings.yml.
2016-02-27 19:06:44 -06:00
Adam Tauber 45b5073f3e [fix] pep8 2016-02-27 19:07:53 +01:00
Adam Tauber 472a409022 [fix] robot tests 2016-02-27 19:01:55 +01:00
Adam Tauber 0fbd705259 [enh] settings option to change instance name - closes #450 2016-02-27 18:23:55 +01:00
Luc Didry fea2c5a713 Fix results with no scheme
Related to #428, which was fixed in e3df22b but broken in a refactoring
(b6c3cb0)
2016-02-26 12:05:11 +01:00
Adam Tauber 79705450df [fix] wolframalpha unicode inputs 2016-02-25 14:55:26 +01:00
Adam Tauber 10947536aa [enh] suspend engines after error
The duration is based on the number of continuous errors, but maximized in one minute
2016-02-20 00:21:56 +01:00
Adam Tauber 17b0c9f74a [mod] engine load refactor 2016-02-19 15:13:01 +01:00
Adam Tauber db72fc6449 [fix] encapsulate wolframalpha token fetching errors 2016-02-17 17:21:54 +01:00
Adam Tauber d06178139f [fix] wolframalpha page changes
related issues: #508 #509
2016-02-17 17:11:51 +01:00
Adam Tauber 4e5af8d87b [mod] move plugin static files to static/plugins 2016-02-10 18:06:11 +01:00
Adam Tauber ab6a7601cb [enh] new plugin to open results on new browser tabs 2016-02-10 18:04:04 +01:00
Adam Tauber b5061b5f0f [fix] restrict wikipedia queries to the titles to avoid irrelevant results 2016-02-09 21:21:59 +01:00
Adam Tauber 909424e1e5 [fix] real support of non wikipedia style mediawikis 2016-02-08 21:52:26 +01:00
Adam Tauber 2b0605d723 [enh] add occitan search language - example query: ":oc !wp south" - closes #445 2016-02-06 09:29:52 +01:00
Noemi Vanyi 3034c85163 fix pep8 errors 2016-02-04 21:01:44 +01:00
Noemi Vanyi 33fa3da2e8 add Frinkiac engine & tests 2016-02-04 20:27:36 +01:00
Adam Tauber ebbf33343a [fix] bing images changes 2016-02-01 21:40:28 +01:00
Adam Tauber 37035b7a40 [fix] gigablast params ++ json response format 2016-01-31 13:29:36 +01:00
Adam Tauber e061c6e059 [fix] swisscow and yandex escaping - fixes #499 2016-01-23 15:20:36 +01:00
Thomas Pointhuber 8bc0f04f4b [fix] typo 2016-01-21 15:57:02 +01:00
Adam Tauber 85151ab051 [mod] enable wolframalpha by default 2016-01-21 10:49:46 +01:00
Adam Tauber fab698003f [mod] move wolframalpha to "science" category 2016-01-21 10:45:34 +01:00
a01200356 30bfbf2e07 [fix] pep8 2016-01-18 11:34:38 -06:00
a01200356 51278ee0be Merge branch 'master' of https://github.com/asciimoo/searx 2016-01-18 11:29:45 -06:00
Adam Tauber 09b7673fbd [fix] temporary disable googles inner links - #491 2016-01-18 13:10:21 +01:00
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
Cqoicebordel 525af2a031 Add bing in the test units 2015-01-25 20:14:37 +01:00
Cqoicebordel 44c9216c49 Sanitize extract_text 2015-01-25 20:04:44 +01:00
Thomas Pointhuber 7716806c3d [fix] btdigg 2015-01-25 10:21:44 +01:00
Adam Tauber e7d90b8e86 Merge pull request #200 from Cqoicebordel/bing-date
Change the cookie in bing_news to use the english interface
2015-01-23 11:50:51 +01:00
Cqoicebordel cbe3c8be85 Change the cookie in bing_news to use the english interface
But still uses the language to set the market, and so provide relevant results to the language.
Fix #198
2015-01-22 22:46:34 +01:00
Adam Tauber 833ac04232 [enh] russian .mo file added 2015-01-22 22:42:41 +01:00
Adam Tauber 699fe60e50 [fix] handle single closing element in HTMLTextExtractor 2015-01-22 17:43:45 +01:00
Adam Tauber 06186e72a9 [fix] poolrequest post method parameters 2015-01-22 17:20:44 +01:00
dalf 0a83be0ec9 [fix] google engine: depending on the IP of the searx instance, each searx request where making two HTTP requests (see https://support.google.com/websearch/answer/873?hl=en ) 2015-01-22 11:40:28 +01:00
Adam Tauber c169fc3aa2 Merge pull request #194 from Cqoicebordel/moar-engines
Moar engines
2015-01-22 08:46:04 +01:00
Adam Tauber 10891bdeab Merge pull request #192 from dalf/connection-pool
[enh] improve response time. close #100
2015-01-21 19:44:20 +01:00
Cqoicebordel 032f9bb1c9 Revert some wrong merge to allow torrents links to be visible 2015-01-21 18:03:11 +01:00
Cqoicebordel 85dcfa2c7d BTDigg and Mixcloud engines 2015-01-21 18:02:29 +01:00
dalf d07cfd9089 [enh] use one single http connection pool : improve response time. close #100 2015-01-21 11:33:16 +01:00
Adam Tauber 549dcac588 Merge pull request #188 from Cqoicebordel/general-cookies
General cookies
2015-01-20 17:17:13 +01:00
Cqoicebordel 816a2c5cbe Move cookies in render() 2015-01-20 16:29:54 +01:00
Adam Tauber f6b4220414 Merge pull request #186 from Cqoicebordel/add-bang-autocompletion
Add '?' bang to the autocompleter
2015-01-20 13:41:07 +01:00
Cqoicebordel 393d24ba50 Flake8 2015-01-19 22:26:48 +01:00
Cqoicebordel 4d0aeae567 Thanks @pointhi ! 2015-01-19 22:17:12 +01:00
Cqoicebordel cd179bbdbb Modify theme Courgette to add colors
Two colors are needed so I use a space in the cookie and a split in jinja to "encode" and "decode" them.
We should enforce that each theme if they must use a cookie, prefix its name with the name of the theme.

The color proposed here are based on bootstrap. We could use others.
2015-01-19 22:07:19 +01:00
Cqoicebordel 71ae75d73e Extract color 2015-01-19 22:04:53 +01:00
Cqoicebordel 9b2187b261 Change theme to allow the logo to be text instead of image 2015-01-19 21:24:46 +01:00
Cqoicebordel 1a24fd9c52 Add cookies to every requests 2015-01-19 21:23:22 +01:00
dimqua 475f41224d Update messages.po 2015-01-19 22:51:07 +03:00
Cqoicebordel b01b95194e Allow non specific cookies 2015-01-19 20:16:06 +01:00
Cqoicebordel bc2d5bf88c Add '?' bang to the autocompleter 2015-01-19 19:47:32 +01:00
dimqua 052856e01b Update settings.yml 2015-01-19 21:03:20 +03:00
dimqua 5a3236ddc6 Create messages.po 2015-01-19 20:58:20 +03:00
Adam Tauber fecac90e88 Merge pull request #183 from pointhi/bootstrap_themes
improve oscar-template
2015-01-18 20:04:06 +01:00
Adam Tauber 8cd7617054 [fix] opensearch xml mimetype - #184 2015-01-18 14:26:52 +01:00
Thomas Pointhuber 9c94b1a00a [update] bootstrap.min.css 2015-01-18 13:55:45 +01:00
Thomas Pointhuber 1f00ce8527 Revert: [enh] add new bootstrap-themes to oscar-template 2015-01-18 13:54:24 +01:00
Thomas Pointhuber 7366a0e141 [fix] add wordwrap to fix style issues 2015-01-18 13:42:31 +01:00
Thomas Pointhuber a53c688879 [fix] pep8 2015-01-18 13:05:00 +01:00
Thomas Pointhuber 016a0ffe8a [enh] show js warning only if menu can't be used or inside preferences 2015-01-18 13:03:53 +01:00
Thomas Pointhuber 096ffd0659 [enh] add new bootstrap-themes to oscar-template 2015-01-18 12:00:38 +01:00
dalf 1d51512152 Proxify most of images references
Create hash only when necessary
2015-01-18 09:54:24 +01:00
dalf 9154cf7930 Proxify images inside infoboxes 2015-01-17 22:36:48 +01:00
dalf b6d27aca59 [enh] image-proxy : handle ETag and date related headers, add hash to URL 2015-01-17 21:54:40 +01:00
Adam Tauber a865e6672f [doc] locale settings comment - #177 2015-01-17 20:51:39 +01:00
Adam Tauber 08c2e263f5 [enh] configurable default interface locale - #177 2015-01-17 20:38:46 +01:00
Adam Tauber 317bce74dd [fix] robot test config option update 2015-01-17 20:36:44 +01:00
Cqoicebordel d910744efe Test its existence before using thumbnail_src
Thanks @pointhi !
2015-01-17 19:49:21 +01:00
Cqoicebordel 2c15546518 Tiny forgots 2015-01-17 19:28:11 +01:00
Cqoicebordel 4238812a51 Flake8 2015-01-17 19:24:35 +01:00
Cqoicebordel cb4a3fe598 Add thumbnails in images results
- Modify engines to create/fetch an URL for the thumbnails
- Modify themes to show thumbnails instead of full images.

In Courgette, the result is not very beautiful. Should we change it ?
2015-01-17 19:21:09 +01:00
Adam Tauber edd9d31180 [fix] test with default theme 2015-01-16 17:46:02 +01:00
Adam Tauber 9ca50676eb [fix] pep8 2015-01-16 17:37:34 +01:00
Adam Tauber 0a3b9a7b00 [enh] add image proxy toggle to preferences templates 2015-01-16 16:58:44 +01:00
Adam Tauber f3d7af33fd [enh] image proxy config from preferences 2015-01-16 16:57:53 +01:00
Adam Tauber a1bf02e652 [enh] add image proxy to image results 2015-01-16 16:26:48 +01:00
Adam Tauber 01143f48c5 [enh] image proxification 2015-01-16 16:26:15 +01:00
Adam Tauber 60eb831966 [enh] image proxy base 2015-01-16 16:02:21 +01:00
Adam Tauber 306c644fa7 [mod] oscar as default theme 2015-01-16 12:36:33 +01:00
Adam Tauber 3fd562ccd7 Merge pull request #176 from Cqoicebordel/courgette-UXUI
Courgette theme - UIUX
2015-01-16 12:24:38 +01:00
Cqoicebordel 2fc1de54da Lots of courgette modification 2015-01-16 00:56:54 +01:00
Cqoicebordel 14447a0761 Modify courgette theme and less it. 2015-01-16 00:55:28 +01:00
Cqoicebordel 4f14f6cd26 New icons for Courgette 2015-01-16 00:29:11 +01:00
Cqoicebordel b4b666e703 Flake8 2015-01-15 20:27:30 +01:00
Cqoicebordel fa0330f0ff Fix startpage
Fix issue with unicode caracters in startpage : we shouldn't urlencode them if we are using POST.
Should fix #169. @dimqua can you confirm ?
2015-01-15 20:18:40 +01:00
Adam Tauber fe5ff51377 [mod] pygments dependency warning 2015-01-15 18:55:25 +01:00
Adam Tauber 6503fdf2aa [enh] add cpp language rewrite rule 2015-01-15 18:40:19 +01:00
Adam Tauber a61a96d975 [enh] log highlighter errors 2015-01-15 18:39:40 +01:00
Adam Tauber a04fafd419 Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results
Conflicts:
	searx/static/themes/default/css/style.css
	searx/static/themes/oscar/css/oscar.min.css
	searx/templates/oscar/result_templates/torrent.html
2015-01-15 18:26:00 +01:00
Adam Tauber c5599e3c7c Merge pull request #174 from pointhi/nojs_fix
add no javascript support to oscar-template
2015-01-15 17:05:44 +01:00
Thomas Pointhuber de6064994e [enh] show text "Start search" instead of icon, if javascript is disabled 2015-01-15 16:03:30 +01:00
Thomas Pointhuber 525833bea7 [enh] disable js-based links if no js is available 2015-01-15 15:55:39 +01:00
Thomas Pointhuber 5bfaabeb6b [enh] add nojs support into oscar-template 2015-01-15 15:48:50 +01:00
Cqoicebordel 389fc3b8b2 Few fixes
- Whitespaces
- Change a few <p> in <span>
- Add RSS to allow browser detection
- A few UIUX changes
- Add a few more allowed translations
2015-01-15 01:48:46 +01:00
Cqoicebordel 08df681b48 Tweaks of color and theme 2015-01-15 01:46:01 +01:00
Cqoicebordel ceb650a01f Add lots of icons 2015-01-15 01:00:48 +01:00
Adam Tauber 410dbc573b [enh] static content generalization 2015-01-12 14:54:16 +01:00
Adam Tauber 12425618ca Merge pull request #172 from Cqoicebordel/torrents-w3c+ux+rss
Torrents w3c+ux+rss
2015-01-12 14:15:45 +01:00
Adam Tauber b47b8cc2c6 Merge pull request #166 from Cqoicebordel/non-exclusif-bang
Add non exclusif bang
2015-01-12 14:14:40 +01:00
Cqoicebordel 824208491a Scientific accuracy 2015-01-12 13:08:32 +01:00
Cqoicebordel 3002725e2d Few more translations 2015-01-12 11:04:54 +01:00
Cqoicebordel e32cb59ad6 W3C fix 2015-01-11 19:45:17 +01:00
Cqoicebordel 6ca81f649d Fix RSS link
Fix page number, urlencoded request and encoded &
2015-01-11 19:34:50 +01:00
Cqoicebordel c59d0c200e Fix torrent W3C+UX
Puts links to torrents and magnets in tool bar
Fixes a lot of W3C errors
2015-01-11 19:34:11 +01:00
Adam Tauber d7ea44ab8d [fix] dates before 1900 2015-01-11 13:26:42 +01:00
Adam Tauber 23fa74b5f9 [enh] date formatting by locale 2015-01-11 13:26:40 +01:00
Adam Tauber e1856426e2 [fix] hadle missing title 2015-01-11 01:42:55 +01:00
Adam Tauber 8ef709ea1f Merge pull request #170 from pointhi/little_fixes
Little fixes, add searx-autocompletion, more informations about torrents
2015-01-11 01:20:46 +01:00
Thomas Pointhuber 9109686c4e [enh] using less html code to disable autoescaping for embeded results 2015-01-10 20:26:17 +01:00
Thomas Pointhuber 811515101b [fix] pep8 2015-01-10 20:01:36 +01:00
Thomas Pointhuber c19b0899a4 [fix] little autocompleter fix 2015-01-10 19:55:21 +01:00
Thomas Pointhuber eb6f3348c4 [enh] display filesize greater 1TB 2015-01-10 19:44:08 +01:00
Thomas Pointhuber 08f820d74c [enh] make some torrent strings translatable 2015-01-10 19:42:41 +01:00
Thomas Pointhuber 830f70a6bc [enh] improve torrent results 2015-01-10 19:40:27 +01:00
Thomas Pointhuber 4e2dae30f0 [enh] add autocompletion for searx-specific strings 2015-01-10 16:42:57 +01:00
Adam Tauber aff33ea896 [fix] autocompleter error handling 2015-01-10 15:27:42 +01:00
Thomas Pointhuber 29a526ff0e [enh] add rss-link which can be detected by browsers 2015-01-10 15:24:21 +01:00
Adam Tauber 39c3f5658e [fix] endless logging recursion 2015-01-10 13:10:17 +01:00
Thomas Pointhuber 400b54191c Merge branch 'master' of https://github.com/asciimoo/searx into code_results
Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html
2015-01-09 21:30:09 +01:00
Adam Tauber c8be128e97 [mod] ignore startpage unicode errors 2015-01-09 11:21:46 +01:00
Adam Tauber 23b4a53248 [enh] engine exception traceback 2015-01-09 04:30:55 +01:00
Adam Tauber d6b1ff08ad Merge branch 'master' of github.com:asciimoo/searx 2015-01-09 04:15:57 +01:00
Adam Tauber 299a80a1eb [enh] using the logger 2015-01-09 04:13:05 +01:00
Adam Tauber 425a576f28 [fix] template syntax 2015-01-09 04:05:39 +01:00
Adam Tauber 6cbd29f674 [enh] logging added 2015-01-09 04:01:31 +01:00
Adam Tauber 05be069f42 Merge branch 'integrated-videos' of https://github.com/Cqoicebordel/searx into Cqoicebordel-integrated-videos
Conflicts:
	searx/engines/vimeo.py
2015-01-07 11:48:36 +01:00
Cqoicebordel a723936ad4 Updated translations without fuzzy translations 2015-01-05 20:56:48 +01:00
Cqoicebordel cacdb064db Updated translations 2015-01-05 20:26:49 +01:00
Cqoicebordel 67bd68b5e5 Put media above result content
Mimick more closely usual video viewer (video above, details below)
2015-01-05 20:25:47 +01:00
Cqoicebordel 0ca04be55d Remove print 2015-01-05 20:24:33 +01:00
Cqoicebordel b918cd2b8e Whitespace correction 2015-01-05 02:09:11 +01:00
Cqoicebordel 4a195e0b28 Integrated media in results + Deezer Engine
New "embedded" item for the results, allow to give an iframe to display the media directly in the results.
Note that the attributes src of the iframes are not set, but instead data-src is set, allowing to only load the iframe when clicked.

Deezer engine based on public API (no key).
2015-01-05 02:04:23 +01:00
Cqoicebordel 3aa3a4633f Few fixes on Vimeo
Change URL from https to http
Change way of handling text xpath
2015-01-03 23:55:50 +01:00
Cqoicebordel 4450ed5503 Digg correction
Return no result instead of crashing if no result
2015-01-03 23:54:02 +01:00
Cqoicebordel 96c4d52eef Add non exclusif bang
Allow to perform a search while adding an engine (or a category) without adding it "officially" to the request.
'?' is used to add an engine without modifying anything else to the request. For example, you can perform a search in the 'general' category, and if you add '?tw' the result from Twitter will be added to the originals results.
2015-01-03 02:31:23 +01:00
Adam Tauber cc4e17b668 [fix] pep8 2015-01-02 12:33:40 +01:00
Adam Tauber e5a323b288 [fix] favicon paths 2015-01-01 19:52:05 +01:00
Adam Tauber 798bef77f9 [fix] static content paths 2015-01-01 19:24:47 +01:00
Adam Tauber 2f9a386c0d [enh] better result template handling 2015-01-01 18:59:53 +01:00
Adam Tauber 20c4de8f06 [fix] filename strip 2015-01-01 18:06:51 +01:00
Adam Tauber 8151585918 [fix] static file paths 2015-01-01 17:54:33 +01:00
Adam Tauber 9f12605f7e [enh] themes static content refactor 2015-01-01 17:48:12 +01:00
Adam Tauber e3957d6adf Merge pull request #143 from Cqoicebordel/Wiki-date
Use human readable date for infobox
2015-01-01 14:36:28 +01:00
Adam Tauber 2181c4384e [mod] purge local html_to_text 2015-01-01 14:14:56 +01:00
Adam Tauber 1408859b4b [fix] ignore scripts/styles in html_to_text 2015-01-01 14:13:56 +01:00
Adam Tauber 469e08881e Merge pull request #165 from Cqoicebordel/Moar-engines
Moar engines
2015-01-01 14:10:59 +01:00
Adam Tauber c7cbd38fcc Merge pull request #164 from pointhi/favicons
improve Favicons
2015-01-01 14:06:34 +01:00
Cqoicebordel 5d977056f7 Flake8 and Twitter corrections
Lots of Flake8 corrections
Maybe we should change the rule to allow lines of 120 chars. It seems more usable.

Big twitter correction : now it outputs the words in right order...
2014-12-29 21:31:04 +01:00
Cqoicebordel 576fdef440 Google Play Store
Add Google play store apps, movies and music (sound -> gps)
2014-12-28 23:23:31 +01:00
Cqoicebordel e7e2981536 Digg + Twitter corrections
Digg engines, with thumbnails
Add pubdate for twitter
2014-12-28 22:57:59 +01:00
Thomas Pointhuber 8f4814ade2 [fix] fix test 2014-12-28 15:53:03 +01:00
Thomas Pointhuber 67698ad29a [enh] add new favicons to oscar template 2014-12-28 15:46:03 +01:00
Thomas Pointhuber a7adcacd04 [enh] add new marker-icons for map
fetched from https://github.com/pointhi/leaflet-color-markers
2014-12-28 15:10:42 +01:00
Thomas Pointhuber a0293d6196 [enh] move favicons into own directory 2014-12-28 15:07:11 +01:00
Thomas Pointhuber 98815a0d61 [enh] add turkish translation 2014-12-28 09:52:03 +01:00
Thomas Pointhuber 35dc043c09 [enh] update translations 2014-12-27 14:43:24 +01:00
Adam Tauber fcc394540b [enh] v0.6.0 2014-12-25 17:56:01 +01:00
Adam Tauber 5cfb42350b [enh] nl, de, fr, hu translation updates 2014-12-25 11:06:30 +01:00
Adam Tauber 61ab5f2693 [fix] view tests 2014-12-24 21:15:36 +01:00
Adam Tauber 3b3921fc59 [enh] subtitleseeker: better language handling 2014-12-24 21:02:26 +01:00
Adam Tauber ada01cb367 Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons
Conflicts:
	searx/templates/courgette/result_templates/default.html
	searx/templates/courgette/result_templates/map.html
	searx/templates/courgette/result_templates/videos.html
	searx/templates/default/result_templates/default.html
	searx/templates/default/result_templates/map.html
	searx/templates/default/result_templates/videos.html
	searx/webapp.py
2014-12-24 20:34:08 +01:00
Adam Tauber 5857141e49 Merge pull request #161 from Cqoicebordel/SubtitleSeeker-engine
SubtitleSeeker Engine
2014-12-24 20:21:38 +01:00
Cqoicebordel 10e4f6f316 Add language support
Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian...
2014-12-23 01:51:07 +01:00
Cqoicebordel 2ea55b1c64 Add language support
Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian... (reverted from commit 829948b85d)
2014-12-23 01:45:39 +01:00
Cqoicebordel 829948b85d Add language support
Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian...
2014-12-23 01:41:25 +01:00
Thomas Pointhuber af8dac93a8 [enh] fix pep8, improve syntax highlighting 2014-12-22 16:26:45 +01:00
Thomas Pointhuber d810763107 [enh] remove repeating codeparts inside the oscar template 2014-12-22 16:07:02 +01:00
Thomas Pointhuber 7b44fd47a7 [enh] improve grunt-file for oscar_template 2014-12-22 15:28:23 +01:00
Adam Tauber b975418e4c [fix] flickr engine code cleanup ++ handle missing owner 2014-12-22 14:15:59 +01:00
Adam Tauber af41607410 Merge pull request #149 from Cqoicebordel/Flickr-engine
Rework Flickr Engine
2014-12-22 13:33:32 +01:00
Cqoicebordel 550232fc21 SubtitleSeeker Engine
Add the subtitleseeker engine.
2014-12-22 01:00:16 +01:00
Thomas Pointhuber 7adb17452d [enh] add result_templates/code.html 2014-12-20 23:33:03 +01:00
Adam Tauber 2e41bfcbdb [enh] engine shortcut validation 2014-12-20 12:17:03 +01:00
Adam Tauber 7eb27848c2 Merge pull request #159 from pointhi/photon_fix
[fix] fix language support in photon engine
2014-12-20 11:58:34 +01:00
Thomas Pointhuber 533e6287ae [fix] fix language support in photon engine 2014-12-20 10:25:53 +01:00
Cqoicebordel 56399cf1ea Add 500px and Searchcode engines
Allow to search for images on 500px. It doesn't use the official API, but the page result. Less stable, but less API key to possess...

Two engines were necessary for Searchcode because there are to search mode : search for documentation or search for code example. Both use open APIs.
2014-12-20 07:07:32 +01:00
Adam Tauber 667f4d5cfc Merge pull request #156 from Cqoicebordel/Fix-map-oscar
[fix][enh] Multiple JS changes in Oscar
2014-12-19 22:53:37 +01:00
Adam Tauber f141773814 [mod][fix] https rewrite refactor ++ fixes 2014-12-19 22:40:37 +01:00
Adam Tauber 813247b37a Merge pull request #152 from pointhi/search_engines
[enh] add photon engine, and fix pep8 errors
2014-12-19 20:06:21 +01:00
Adam Tauber 1c969186bf [mod] better search request exception handling 2014-12-19 20:01:01 +01:00
Adam Tauber 8c05c00762 [fix] handle empty search requests 2014-12-19 19:40:40 +01:00
Adam Tauber 2b7f3e28e7 [mod] display timeoutted engine name 2014-12-19 13:59:41 +01:00
Cqoicebordel 2fe3323449 Add double clic on categories
Allow to double clic on any category to activate or deactivate all categories.
2014-12-19 06:11:46 +01:00
Cqoicebordel 2ab621c0e3 Some more path issues 2014-12-19 05:05:12 +01:00
Cqoicebordel 83d6f36659 Final commit on favicons
Definitely remove engine array
Change every themes to accomodate that change
Tweak of video template of oscar to add link on video thumbnail
2014-12-18 16:26:32 +01:00
Cqoicebordel 06b59c7210 [fix] Show map on result in Oscar
Allow to find the leafleet js when searx is not installed at the root of the web server.
2014-12-18 15:51:09 +01:00
Adam Tauber 789e46f1c8 [fix] timeout and response parsing order 2014-12-18 12:07:20 +01:00
Adam Tauber 77c3a27f56 [mod] strict timeout handling 2014-12-18 10:11:56 +01:00
Cqoicebordel 930f724ec6 Add an No Api Flickr Engine
It uses the webpage json infos to build the results
Let the user choose the engine in setting.yml. Noapi active by default
+ little corrections on Flickr engine
2014-12-16 20:40:03 +01:00
Thomas Pointhuber a508d540ac [fix] pep8 2014-12-16 17:26:16 +01:00
Thomas Pointhuber 91f9973227 [fix] pep8 2014-12-16 17:10:20 +01:00
Thomas Pointhuber 672f1c674c [fix] pep8 2014-12-16 17:01:25 +01:00
Thomas Pointhuber 48058075c0 [fix] remove useless print statement 2014-12-16 16:32:59 +01:00
Thomas Pointhuber 5ae38bafdf [enh] add photon engine 2014-12-16 15:01:05 +01:00
Adam Tauber 19b1cedc23 Merge pull request #151 from pointhi/kickass_fix
[fix] fix kickass engine
2014-12-15 23:11:15 +01:00
Thomas Pointhuber 70fc1002db [fix] fix kickass engine
thanks @Cqoicebordel in #144:
https://github.com/asciimoo/searx/pull/144#issuecomment-67036903
2014-12-15 19:37:58 +01:00
Thomas Pointhuber 7895e4f7a7 [enh][oscar_template] replace kickass icon 2014-12-15 10:49:35 +01:00
Cqoicebordel 0059d08f13 Rework Flickr Engine
Everything was redone to use the API. It needs an API key, but it's worth it.
Everything works. Title, Image, Content, URL
The API allow lots of things. Thumbnails and date will be easy to add when it will be implemented in Searx.

Fix asciimoo/searx#126
2014-12-15 04:06:42 +01:00
Adam Tauber e047d22046 Merge pull request #144 from Cqoicebordel/KickassTorrent-Search-Engine
Kickass torrent search engine
2014-12-15 00:02:14 +01:00
Cqoicebordel e623ee593a Add icons and badge for the themes
Add kickass in engine list
Add content for the result from kickass
2014-12-14 23:27:27 +01:00
Adam Tauber ba51d784d1 [fix] mysterious string remove 2014-12-14 02:27:58 +01:00
Adam Tauber d93d703703 [fix] use queues to answers/suggestions/infoboxes 2014-12-14 02:15:04 +01:00
Adam Tauber a5324d9d82 [fix] proper search timeout handling 2014-12-14 01:18:01 +01:00
Adam Tauber f5aec98cbd Merge pull request #145 from Cqoicebordel/HTML+Bugs-Templates
Html+Bugs in templates
2014-12-13 23:27:49 +01:00
Cqoicebordel e71b665fd5 Load the list of icons only once 2014-12-13 21:37:28 +01:00
Cqoicebordel b2f5f65595 Correct test case
Add the alt in favicon
2014-12-13 20:30:19 +01:00
Adam Tauber 2cfa760b57 [mod] engine load refactor 2014-12-13 19:26:40 +01:00
Adam Tauber f13a6ab795 [fix] disable debug mode 2014-12-13 18:41:24 +01:00
Cqoicebordel 53a9af39ef Use the new way of finding the favicon 2014-12-12 19:16:29 +01:00
Cqoicebordel f3f544d5b5 Use the new way of finding the favicon 2014-12-12 19:15:30 +01:00
Cqoicebordel 002b812cc6 Use the new way of finding the favicon 2014-12-12 19:14:30 +01:00
Cqoicebordel 3ffe6014ed Use the new way of finding the favicon 2014-12-12 19:13:40 +01:00
Cqoicebordel 3b88adf8b6 Use the new way of finding an icon 2014-12-12 19:12:37 +01:00
Cqoicebordel 0bfc793194 Add a variable with all the icons of the theme
Add for the template a list of available icons in the current theme.
2014-12-12 19:09:02 +01:00
Adam Tauber 7c261d4885 [mod] disabling piratebay, according to #146 and https://torrentfreak.com/feds-receive-requests-to-shut-down-the-pirate-bay-140801/ 2014-12-11 18:12:38 +01:00
Adam Tauber e51cc708ad [fix] piratebay url 2014-12-11 15:28:04 +01:00
Cqoicebordel 8fb6ea1bf1 Add title and alt on image in infobox 2014-12-10 18:27:08 +01:00
Cqoicebordel 5104552937 Multiple HTML corrections
Alt on favicon
No <p> in <p>
Correct alt and title on img
2014-12-10 18:21:41 +01:00
Cqoicebordel 94ea67547a HTML and usability corrections
Put the result URL at the top, like in other results template
Put the magnet link on the same line as the stats (peer/seed).
2014-12-10 18:20:20 +01:00
Cqoicebordel 3e05570b32 Alt on favicon 2014-12-10 18:17:47 +01:00
Cqoicebordel 2bb820c281 Correct alt and title 2014-12-10 18:17:10 +01:00
Cqoicebordel 8708e5fc56 Alt on favicons 2014-12-10 18:16:32 +01:00
Cqoicebordel 149e19c68a Correct HTML entities and link 2014-12-10 18:15:39 +01:00
Cqoicebordel a809fd1bbb Multiple HTML corrections
Alt on favicon
Width of image should be 400 and not 400px
Correct alt+title on image
No <p> contains <p>
2014-12-10 18:14:29 +01:00
Cqoicebordel eef05c3ddc Alt on favicon 2014-12-10 18:11:59 +01:00
Cqoicebordel b043237c61 Correct alt and title 2014-12-10 18:11:20 +01:00
Cqoicebordel 74000c739d Alt on favicon 2014-12-10 18:10:19 +01:00
Cqoicebordel 18f772615b HTML Entities + Use the right template
Courgette was using the wrong template. I assume it was a mistake.
2014-12-10 18:09:21 +01:00
Cqoicebordel 978b476024 Add KickAss engine 2014-12-09 19:21:35 +01:00
Cqoicebordel 15a4c10c99 First pass at Kickass Engine
Parse and return results correctly. Pages numbers taken care of.

Not done, and maybe to do :
- 'content' : I don't know what it could be. Maybe votes ?
- 'categories' : the results are not filtered by categories, because I don't see how to do it properly : there are too much categories on Kickass. Is 'video' only movies, or also tv show or porn ? So for now, the category is 'all'.
- Favicon/icon : may be a good idea.
2014-12-09 19:19:39 +01:00
Cqoicebordel 7937218be6 Use human readable date
For DoB and DoD, wikipedia use a non standard ISO format, not easily readable.
Now the date is displayed in an human readable form, using the language setting as locale if available. If not, it uses the default locale.
2014-12-09 02:36:53 +01:00
Adam Tauber 41aca9a068 [fix] autocomplete x-suggestion 2014-12-09 00:57:04 +01:00
Adam Tauber 0f4cb32bf1 [mod] image results removed from google engine 2014-12-09 00:53:09 +01:00
Adam Tauber 2538a3ec26 [enh] v0.5.0 2014-12-08 23:57:36 +01:00
Adam Tauber 8e6ae188b8 [mod] search thread names 2014-12-08 23:55:11 +01:00
Adam Tauber 44409cb61f Merge pull request #141 from Cqoicebordel/UX+Bugs+HTML
UX+bugs+html
2014-12-08 23:48:01 +01:00
Cqoicebordel b973081134 [fix] Google image with special chars
It seems like Google image is doing a double urlencode on the url of the images. So we need to unquote once before sending to the browser the urls.
It solves the 404 we could see with some image with specials chars in url. 
Exemple https://searx.laquadrature.net/?q=etes&pageno=1&category_images (there are two of those in the list)
2014-12-08 21:12:50 +01:00
Cqoicebordel 25c743f2af Striptag on alt and title
Strip HTML tags on alt and title of the images
2014-12-08 12:54:12 +01:00
Cqoicebordel 79b936963f Bug + HTML corrections
Add alt on favicon.
Use correct datetime format
Remove pubdate tag
Use url instead of pretty_url for web.archive.org
Add alt on video image
2014-12-08 01:26:28 +01:00
Cqoicebordel 9ea2d8c131 Bug + HTML corrections
Add alt on favicons
Use correct datetime format
Remove pubdate tag
Use url instead of pretty_url for web.archive.org
2014-12-08 01:22:54 +01:00
Cqoicebordel 0b98f71ff0 HTML corrections
Add alt on favicons
Use right format for datetime
Remove pubdate tag
2014-12-08 01:19:05 +01:00
Cqoicebordel 977972a8ec UX + HTML corrections
Add title on image for hover
Add alt on favicon
2014-12-08 01:11:45 +01:00
Cqoicebordel 0a2051ef3c Bug + HTML corrections
Add alt for favicon
Correct datetime format
Remove pubdate (not in html5 spec)
Don't use pretty_url for web.archive.org.
2014-12-08 01:09:16 +01:00
Cqoicebordel 42692aa2c5 Add alt for img
Add alt in infobox image.
2014-12-08 01:03:28 +01:00
Cqoicebordel 34b5d95669 UX and HTML corrections
Put the infobox first. Result first is more useful for the user.
Add id in form for "for".
htmlentities in the URL.
Take care of spaces in categories.
2014-12-08 01:01:33 +01:00
Cqoicebordel c2e88339f7 Add pubdate
Add pubdate with a good format, against publishedDate.
2014-12-08 00:51:46 +01:00
dalf 7c13d630e4 [fix] pep8 : engines (errors E121, E127, E128 and E501 still exist) 2014-12-07 16:37:56 +01:00