Commit Graph

463 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
6503fdf2aa [enh] add cpp language rewrite rule 2015-01-15 18:40:19 +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
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
e1856426e2 [fix] hadle missing title 2015-01-11 01:42:55 +01:00
Thomas Pointhuber
811515101b [fix] pep8 2015-01-10 20:01:36 +01:00
Thomas Pointhuber
830f70a6bc [enh] improve torrent results 2015-01-10 19:40:27 +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
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
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
0ca04be55d Remove print 2015-01-05 20:24:33 +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
Adam Tauber
cc4e17b668 [fix] pep8 2015-01-02 12:33:40 +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
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
e7e2981536 Digg + Twitter corrections
Digg engines, with thumbnails
Add pubdate for twitter
2014-12-28 22:57:59 +01:00
Adam Tauber
3b3921fc59 [enh] subtitleseeker: better language handling 2014-12-24 21:02:26 +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
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
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
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
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
2cfa760b57 [mod] engine load refactor 2014-12-13 19:26:40 +01:00
Adam Tauber
e51cc708ad [fix] piratebay url 2014-12-11 15:28:04 +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
0f4cb32bf1 [mod] image results removed from google engine 2014-12-09 00:53:09 +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
dalf
7c13d630e4 [fix] pep8 : engines (errors E121, E127, E128 and E501 still exist) 2014-12-07 16:37:56 +01:00
dalf
ffcec383b7 [fix] pep8 : duckduckgo_definitions and wikidata engines 2014-12-07 16:36:20 +01:00
Adam Tauber
611f4e2a86 [fix] pep8 2014-12-05 20:03:16 +01:00
Adam Tauber
075a5fe898 Merge pull request #127 from pointhi/template_oscar_map
Template oscar, add map support
2014-11-19 16:19:03 +01:00
Thomas Pointhuber
4b75d41f86 [enh][oscar_template] loading map informations from overpass-api 2014-11-19 15:49:55 +01:00
Adam Tauber
b1234ee889 [fix] startpage engine compatibility 2014-11-17 10:19:23 +01:00
Thomas Pointhuber
bc12a76fbb [fix] use address.city if possible 2014-11-03 18:53:04 +01:00
Thomas Pointhuber
c38917bb2a [enh] template_oscar: show addressdata if possible 2014-11-03 18:46:58 +01:00
Thomas Pointhuber
740594a4b7 [enh] oscar_template: initial osm-map support for map results
* TODO: remove leaflet.min.css if not required
2014-11-02 13:00:28 +01:00
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