ZaclysIndustries/searxngRebrandZaclys
2
0
Fork 0
forked from zaclys/searxng
Code Issues Pull Requests Activity
1,998 Commits 3 Branches 17 Tags 53 MiB
9743bde25e
Commit Graph

660 Commits

Author SHA1 Message Date
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
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
a01200356
e4dd75070f Pinche Travis. 2015-12-28 01:27:19 -06:00
a01200356
0bb403bb47 More fixes (Travis again). 
forfuckssaketravisnotagain
 2015-12-28 01:24:26 -06:00
a01200356
bc2420f8d4 Fix Travis errors. 2015-12-28 01:17:42 -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
a01200356
4578575c28 Wolfie kinda works using API 2015-12-23 00:01:00 -06: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
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
Kang-min Liu
ac8759cd3f Merge remote-tracking branch 'origin/master' 2015-11-14 00:05:44 +01:00
Adam Tauber
e98aef6fc4 [fix] yandex engine language support according to #430 2015-10-31 23:05:07 +01:00
Adam Tauber
fafc564874 [enh] yandex engine added 2015-10-31 15:27:23 +01:00
Adam Tauber
5d49c15f79 [fix] google engine - ignore new useless result type 2015-10-29 12:47:12 +01:00
Thomas Pointhuber
4508c96667 [enh] fix content fetching, parse published date from description 2015-10-24 16:19:47 +02:00
Adam Tauber
f1ac794a07 [fix] gigablast url params 2015-10-16 12:05:50 +02:00
Adam Tauber
7aa9f4885a [fix] unicode decoding 2015-10-16 11:53:52 +02:00
Adam Tauber
0ad272c5cb [fix] content escaping - closes #441 
TODO check other engines too
 2015-09-30 16:42:03 +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
6bcbd633a5 [fix] remove obsolete youtube engine 2015-09-08 22:10:41 +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
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
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
28493d41a3 [fix] handle missing url in twitter results 2015-08-25 13:12:51 +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
Adam Tauber
1fcf066a81 [mod] change settings file structure according to #314 2015-08-02 20:32:22 +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
Adam Tauber
8d36a8b837 Merge pull request #333 from dalf/piratebay 
[fix] Piratebay engine
 2015-06-30 12:46:00 -04:00
Cqoicebordel
ab273e2faa Fix Vimeo engine. 
Solve #368
 2015-06-12 19:53:38 +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
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
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
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
6765823c56 [fix] set engine.safesearch to False if not defined 2015-05-30 12:37:18 +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
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
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
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
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
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
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
Adam Tauber
18e7d60702 Merge pull request #298 from dalf/ssl 
[fix] SSL : SNI support
 2015-04-26 13:12:04 -04:00
Alexandre Flament
99efd790c8 engines: use https when possible 2015-04-26 18:13:09 +02:00
Alexandre Flament
201928d2b0 [fix] SSL : SNI support 2015-04-26 12:04:29 +02:00
Adam Tauber
e1adf8f7b8 [fix] piratebay - cloudfare ssl errors 2015-04-07 12:06:07 +02:00
Adam Tauber
52d243f7af [fix] piratebay: missing torrent link 2015-03-29 21:05:43 +02: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
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
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
dalf
5029cb4787 [fix] close #197 for all engines 2015-02-13 11:17:00 +01: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
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
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
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
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
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
6be2065670 [fix] piratebay url 2015-02-03 00:21:25 +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
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
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
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
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
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
3282e62ff9 Searchcode engines corrections 2015-01-27 22:39:25 +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
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