Commit Graph

388 Commits

Author SHA1 Message Date
Thomas Pointhuber 0e1035eac1 Merge https://github.com/asciimoo/searx into template_oscar
Conflicts:
	searx/translations/de/LC_MESSAGES/messages.po
	searx/translations/en/LC_MESSAGES/messages.po
	searx/translations/es/LC_MESSAGES/messages.po
	searx/translations/fr/LC_MESSAGES/messages.po
	searx/translations/hu/LC_MESSAGES/messages.po
	searx/translations/it/LC_MESSAGES/messages.po
	searx/translations/nl/LC_MESSAGES/messages.po
	searx/webapp.py
2014-10-26 19:11:28 +01:00
Adam Tauber 5740cfbf1c [fix] pep8 part II. 2014-10-19 12:41:04 +02:00
Adam Tauber b0fd71b7b3 [fix] pep8 compatibility 2014-10-19 12:18:21 +02:00
Adam Tauber 28fed5d9ad Merge pull request #115 from pointhi/engine_faroo
add faroo engine
2014-10-19 12:07:02 +02:00
Thomas Pointhuber bc5a7153d3 fix comment header of faroo engine 2014-10-17 12:56:14 +02:00
Thomas Pointhuber db4ca4784b fix faroo engine 2014-10-17 12:54:22 +02:00
Thomas Pointhuber 8af2184a45 add faroo engine support 2014-10-17 12:42:16 +02:00
kernc e1b76c6811 Search Music also on YouTube
YouTube hosts a lot of music and should be enabled for Music search by default.
2014-10-13 14:51:15 +02:00
Adam Tauber b0bb94fd37 [fix] wikidata: using only the first url 2014-10-12 14:33:03 +02:00
dalf cac1761a54 [enh] infoboxes : if the result doesn't contain anything except one link, use the normal result template 2014-10-11 15:49:50 +02:00
dalf 295b1699ce [mod] return only one result from the wikidata engine 2014-10-11 12:47:30 +02:00
Thomas Pointhuber f3b565e17e oscar template: implement first version of results page
* implement results page
* improve search form template
* implement all result_templates
* fix youtube engine
2014-10-05 14:40:46 +02:00
Adam Tauber 727c7226d9 [fix] code cleanup 2014-10-04 22:53:54 +02:00
dalf 63a0328c8b [enh] wikidata engine : add links to musicbrainz 2014-10-02 23:40:06 +02:00
dalf 829c758970 Merge remote-tracking branch 'upstream/master' 2014-10-01 22:25:11 +02:00
Dalf 0a71525ab6 [enh] add infoboxes and answers (clean up) 2014-10-01 22:17:35 +02:00
Thomas Pointhuber fdad5f7cad fix float division by zero bug in score calculation 2014-10-01 19:16:34 +02:00
Dalf 6bfd566353 [enh] add infoboxes and answers 2014-09-28 16:51:41 +02:00
Dalf 5dc3eb3399 [fix] rewrite the google engine since Google Web Search API is about to expire 2014-09-14 14:40:55 +02:00
dalf 64b75e6d82 [enh] duckduckgo engine: add language support 2014-09-07 22:52:13 +02:00
Dalf a4ffeddce1 [fix] yahoo engines: parse_url doesn't throw an exception with not tracking URL 2014-09-07 18:42:56 +02:00
Dalf a92e3ba446 [fix] bing_new engine : fix published date parsing 2014-09-07 18:10:05 +02:00
Dalf 7f1e2ba211 [enh] dailymotion engine: add language support 2014-09-07 17:14:42 +02:00
Adam Tauber a288aa322e Merge branch 'master' of github.com:asciimoo/searx 2014-09-06 14:17:26 +02:00
Adam Tauber 3319091496 [enh] new engine: openstreetmap 2014-09-06 14:09:03 +02:00
Adam Tauber 46e3e1a390 [fix] print removed 2014-09-05 10:46:08 +02:00
Adam Tauber 24401c0e16 [fix] print removed 2014-09-04 23:53:39 +02:00
Adam Tauber 35ddbecd74 [fix] string formatting 2014-09-04 23:53:13 +02:00
Adam Tauber 29afa9b4a1 Merge pull request #91 from pointhi/engines
fix yacy-engine and add comments
2014-09-04 21:50:02 +02:00
Adam Tauber cb8acbd2c3 [enh][fix] support base_urls without language code ++ extra whitespaces removed 2014-09-04 21:19:11 +02:00
Thomas Pointhuber 2cd980134b fix yacy-engine and add comments
* add language support
* add image-support
* add basic-implementation for video, music and file handling
* refactore engine
* add comments
2014-09-03 13:47:12 +02:00
Thomas Pointhuber 63560607ad fix mediawiki-comment
* bug: setting language_support to False result in no results
2014-09-03 11:50:58 +02:00
Thomas Pointhuber 52ad49ccba using general mediawiki-engine
* writing general mediawiki-engine
* using this engine for wikipedia
* using this engine for uncyclopedia
2014-09-03 11:40:29 +02:00
Thomas Pointhuber 629a05e149 fix youtube engine and add comments
* add language-support
* decrease search-results/site to 5
* add comments
2014-09-02 21:19:20 +02:00
Thomas Pointhuber bb628469d3 fix wikipedia engine and add comments
* add paging support
* make number_of_results changable
* make result calculation more clear
* add comments
2014-09-02 21:01:24 +02:00
Thomas Pointhuber 8eb064dea1 add little note to duckduckgo engine 2014-09-02 20:21:33 +02:00
Thomas Pointhuber 9460750fea fix twitter engine and add comments
* add language-support
* add comments
* little refactoring
2014-09-02 20:14:52 +02:00
Thomas Pointhuber 678a80f043 fix startpage engine and add comments
* add language support
* remove not required code
* improve google-ad detection (no false detection anymore, I hope)
* other improvements
2014-09-02 19:57:01 +02:00
Thomas Pointhuber a46bbb4042 fix stackoverflow and add comments 2014-09-02 18:49:42 +02:00
Thomas Pointhuber 80f98d6041 add little comment 2014-09-02 18:12:42 +02:00
Thomas Pointhuber 64a68a7296 update soundcloud and add comments 2014-09-02 18:12:30 +02:00
Thomas Pointhuber dae88d862b update piratebay engine and add comments 2014-09-02 17:56:32 +02:00
Thomas Pointhuber 334a286c18 update github engine and add comments 2014-09-02 17:37:47 +02:00
Thomas Pointhuber c5d83059d5 update generalfile engine and add comments 2014-09-02 17:28:35 +02:00
Thomas Pointhuber 80b9312e42 add comments to dummy engine 2014-09-02 17:20:16 +02:00
Thomas Pointhuber e6e4de8ba0 rewrite duckduckgo engine and add comments 2014-09-02 17:14:57 +02:00
Thomas Pointhuber 3d61d9b930 little refactoring 2014-09-02 17:13:44 +02:00
Thomas Pointhuber 16d1526818 add comments to deviantart engine 2014-09-02 16:48:18 +02:00
Thomas Pointhuber 58a443be29 fix vimeo engine and add comments
engine generate (Error: None), I don't know why
2014-09-01 17:10:25 +02:00
Thomas Pointhuber 03db970e6a fix yahoo engines and add comments 2014-09-01 16:17:29 +02:00
Thomas Pointhuber 90dcfc1ddd fix dailymotion engine and add comments to it 2014-09-01 15:36:53 +02:00
Thomas Pointhuber 144f89bf78 add comments to google-engines 2014-09-01 15:10:05 +02:00
Thomas Pointhuber cdf74fe563 add bing_images 2014-09-01 14:39:18 +02:00
Thomas Pointhuber 4b1e0423a0 update bing engines and fix bing_news 2014-09-01 14:38:59 +02:00
Thomas Pointhuber 6450082987 little fix for google images engine 2014-08-31 23:00:54 +02:00
Adam Tauber 111a86d355 [fix] html escape 2014-08-06 14:43:44 +02:00
Adam Tauber 66f02dc2b6 [fix] unused globals removed 2014-07-09 01:18:37 +02:00
Adam Tauber b0ba367a1a [enh][mod] search refactor 2014-07-07 13:59:27 +02:00
Adam Tauber a07b2b514c [fix] url path unquoted check to avoid duplications 2014-07-05 17:33:19 +02:00
Adam Tauber 8b0cb686d5 [enh] general-file.com engine added 2014-06-27 17:25:16 +02:00
Adam Tauber 3386e21cdf [fix] flickr.com mods 2014-05-20 16:57:03 +02:00
Adam Tauber b226e6462b [fix] www. domain duplications 2014-05-20 01:16:49 +02:00
Adam Tauber b704f46f8d [fix] flickr compatibility 2014-05-16 18:07:34 +02:00
Adam Tauber 7e946a369b [mod] tpb sort refactor 2014-05-16 16:49:42 +02:00
Adam Tauber 6d84ef13f2 [fix] indentation 2014-05-16 16:44:51 +02:00
rhapsodhy 6725112e6b [enh] sort piratebay results by seeders 2014-05-14 19:30:32 +01:00
Adam Tauber 52a817f5c1 [fix] pep8 2014-03-29 16:38:45 +01:00
Adam Tauber 0207070cde [fix] import 2014-03-24 12:04:07 +01:00
Adam Tauber a8a0de644d [fix] indexing 2014-03-21 18:17:13 +01:00
Adam Tauber 01c2eeb8ff [fix] indexing ++ url extraction 2014-03-21 16:36:13 +01:00
Adam Tauber 3854703d95 [mod] ddg engine mods 2014-03-21 16:33:17 +01:00
Adam Tauber ce08abe223 [fix] remove unused imports ++ pep8 2014-03-18 19:24:01 +01:00
Adam Tauber 018a14431b Merge pull request #57 from pointhi/results
improving publishDate extraction and output of it
2014-03-18 18:20:10 +01:00
Thomas Pointhuber 993271bed3 extract publishDate from vimeo 2014-03-18 15:56:22 +01:00
Thomas Pointhuber 337bd6d907 simplify datetime extraction 2014-03-18 13:19:50 +01:00
Adam Tauber faed14b2c6 [fix] #55 2014-03-18 10:06:14 +01:00
Adam Tauber b735093564 [fix] pep8 2014-03-15 20:20:41 +01:00
Thomas Pointhuber 5538c6771a improve publishDate extraction from yahoo 2014-03-15 19:20:29 +01:00
Thomas Pointhuber b88146d669 showing publishedDate for news 2014-03-14 09:55:11 +01:00
Adam Tauber 3acdf3f9a1 [fix] pep8 2014-03-10 16:46:11 +01:00
Adam Tauber 0fc481f47e [fix] yahoo url extraction 2014-03-08 19:09:03 +01:00
Adam Tauber 2be94c2078 [enh] engine default category init 2014-03-08 13:59:50 +01:00
potato 6f535b6fae [fix] error when xpath_results in extraxt_text is _ElementUnicodeResult instead of _ElementStringResult 2014-03-04 19:43:41 +01:00
Adam Tauber 98b6313d5d [fix] pep8 2014-03-04 14:20:29 +01:00
Adam Tauber ee1ffbc87f [fix] yahoo engine url extraction 2014-03-04 14:19:59 +01:00
Thomas Pointhuber f1404ce72d Create yahoo_news.py 2014-03-04 13:11:53 +01:00
Thomas Pointhuber 0549f8c7c8 Create google_news.py 2014-03-04 13:11:04 +01:00
Thomas Pointhuber 1d5741954e Create bing_news.py 2014-03-04 13:10:04 +01:00
Adam Tauber 4627788834 [fix] yahoo url mods 2014-02-27 10:59:39 +01:00
asciimoo 7db4558de7 [mod][fix] startpage engine updates 2014-02-18 16:14:31 +01:00
asciimoo 5b2680be4b [enh] new engine parameter: timeout 2014-02-13 17:08:22 +01:00
asciimoo c1d7d30b8e [mod] len() removed from conditions 2014-02-11 13:13:51 +01:00
asciimoo 9eb31c0186 [fix] unicode and pep8 fixes 2014-02-07 02:45:12 +01:00
Gabor Nagy 22fd0746d9 Improves PEP8 compatibility. 2014-02-05 20:24:31 +01:00
asciimoo 88425f05d6 [enh] shortcut support added to engines 2014-01-31 15:45:18 +01:00
asciimoo 3a2b9a8682 [fix] pep8 2014-01-31 05:11:37 +01:00
asciimoo 68a0832524 [enh] search language support upadtes 2014-01-31 05:10:49 +01:00
asciimoo 2a788c8f29 [enh] search language support init 2014-01-31 04:35:23 +01:00
asciimoo c573d3d69e [fix] print removed 2014-01-30 14:17:14 +01:00
asciimoo b647244abf [fix] function parameters 2014-01-30 03:10:20 +01:00
asciimoo 72793725e2 [fix] print removed 2014-01-30 02:36:15 +01:00
asciimoo 3dcb835910 [fix] function parameters 2014-01-30 02:36:05 +01:00
asciimoo 642986c2e7 [enh] yahoo engine added 2014-01-30 02:33:24 +01:00
asciimoo fe82637eac [enh] importable url extractor 2014-01-30 02:32:58 +01:00
asciimoo 14f4083ba1 [fix] print removed 2014-01-30 02:13:43 +01:00
asciimoo 9a74113b1c [enh] startpage paging init 2014-01-30 02:10:32 +01:00
asciimoo 7de506bbcd [enh] paging support for stackoverflow 2014-01-30 01:55:49 +01:00
asciimoo 6cbf9bf67d [enh] paging support for soundcloud 2014-01-30 01:50:15 +01:00
asciimoo c567308e49 [enh] paging support for piratebay 2014-01-30 01:48:07 +01:00
asciimoo 35ecb6ec5d [enh] paging support for mediawiki 2014-01-30 01:44:12 +01:00
asciimoo 81b4cc77da [fix] comment removed 2014-01-30 01:23:23 +01:00
asciimoo 8b4d445c42 [enh] paging support for google images 2014-01-30 01:21:33 +01:00
asciimoo 89b676ea6f [enh] paging support for flickr 2014-01-30 01:19:51 +01:00
asciimoo 012c8517e0 [enh] paging support for filecrop 2014-01-30 01:14:08 +01:00
asciimoo c0afc4fea7 [enh] paging support for ddg 2014-01-30 01:03:19 +01:00
asciimoo 805e6f1884 [enh] paging support for youtube 2014-01-30 00:50:47 +01:00
asciimoo 1fd91bd911 [enh] paging support for deviantart 2014-01-30 00:09:47 +01:00
asciimoo 5d54c7d500 [enh] paging support for dailymotion 2014-01-30 00:01:42 +01:00
asciimoo ca271fd861 [enh] bing, google paging support 2014-01-29 21:14:38 +01:00
asciimoo 8bb94e3dc4 [enh] paging support 2014-01-29 20:52:04 +01:00
asciimoo 3207a396bd [enh] google engine added 2014-01-29 19:28:38 +01:00
Matej Cotman 6624dd51f5 add robot tests 2014-01-29 04:58:10 +01:00
asciimoo 85b81be35b [fix] pep8 2014-01-24 09:35:27 +01:00
pw3t b82ba74a7d Merge branch 'ixquick' of https://github.com/pw3t/searx into ixquick
Conflicts:
	searx/engines/startpage.py
2014-01-23 22:17:19 +01:00
pw3t a01042ae61 [ehn] added ixquick engine, using startpage engine 2014-01-23 22:14:03 +01:00
asciimoo 59eeeaab87 [fix] html tag removal 2014-01-23 11:08:08 +01:00
asciimoo 2b1d2dbc84 [enh] i18n support 2014-01-22 00:17:49 +01:00
asciimoo b2492c94f4 [fix] pep/flake8 compatibility 2014-01-20 02:31:20 +01:00
Matej Cotman dd4662978d fix: robot fw, entry points, some flake8, package searx egg 2014-01-20 01:06:29 +01:00
asciimoo 4f4cb1caca [enh] results favico handling 2014-01-19 22:58:50 +01:00
asciimoo bfdd6ebb92 Merge branch 'featured_result' of https://github.com/pw3t/searx 2014-01-19 22:39:56 +01:00
pw3t 1dd35e9916 [ehn] added ixquick engine, using startpage engine 2014-01-19 21:20:07 +01:00
pw3t d6b017efb5 Merge branch 'featured_result' 2014-01-19 19:54:52 +01:00
pw3t 9e72ebe064 Merge branch 'master' of https://github.com/asciimoo/searx 2014-01-19 19:50:17 +01:00
asciimoo 3afdd1d994 [enh] settings unification - new dependency: pyyaml 2014-01-19 00:17:02 +01:00
asciimoo 39ebe1d519 [fix] weight configurable via engines.cfg 2014-01-18 21:55:42 +01:00
asciimoo 046e190721 [mod] function name 2014-01-18 21:53:59 +01:00
pw3t 380b440a55 [fix] replace the png icons by ico's, minor chnage in the html 2014-01-17 20:47:17 +01:00
pw3t a62b94e21c Merge branch 'master' of https://github.com/asciimoo/searx 2014-01-17 20:32:38 +01:00
asciimoo 2d179c4cf6 [enh] general torrent search with piratebay 2014-01-17 17:07:25 +01:00
pw3t a8ec7fe6a4 [ehn] add favicons for vimeo, soundcloud, twitter and youtube 2014-01-16 22:03:43 +01:00
pw3t cf8f444e85 [ehn] Add a 'featured result feature'm putting on top of the reasults ddg definitions and wikipedia (ugly html / css)
[ehn] Add a templates for videos, so the thumbnails all have the same side
2014-01-16 22:03:43 +01:00
András Veres-Szentkirályi 8dfc272191 [enh] simplified mediawiki response processing 2014-01-14 10:34:35 +01:00
asciimoo a65070a72d [enh] own useragent handling init 2014-01-12 20:13:14 +01:00
asciimoo 060ea4d2f5 [fix] whitespaces removed 2014-01-12 18:48:38 +01:00
asciimoo fa6f430f2e [fix] title escaping 2014-01-11 12:39:39 +01:00
asciimoo 0eb3cdf664 [mod] vimeo engine mods 2014-01-11 11:14:46 +01:00
Adam Tauber 6f8daea724 Merge pull request #18 from rsdy/master
highlight different search results differently
2014-01-11 02:12:40 -08:00
rhapsodhy b0a4404217 [enh] highlight piratebay results with light grey border, and indent peers+magnet link 2014-01-11 03:33:41 +00:00
rhapsodhy 74ca542a02 [enh] set up special css classes for highlighting results + highlight definitions with dark grey border 2014-01-11 03:31:54 +00:00