kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-06 05:10:11 +01:00
Code
1,054 Commits 7 Branches 17 Tags 128 MiB
4238812a51
Commit Graph

881 Commits

Author SHA1 Message Date
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