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
350a84520d
[fix] time range detection
2016-07-26 00:28:48 +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
Adam Tauber
54d987636e
[fix] do not load engines which cannot be initialized - closes #585
2016-07-25 23:36:52 +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
93c0c49e9a
add time range search with yahoo
2016-07-25 23:19:46 +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
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
257e52954a
[enh][fix] update to latest dependencies ++ fix tests & travis test runner
...
WARNING: dependency changes
2016-07-04 22:46:43 +02:00
Adam Tauber
2f7752b410
[enh] display number of results
2016-06-28 00:06:50 +02:00
Adam Tauber
5dd2340bc6
[fix] gigablast redirect - closes #575
2016-06-12 00:07:54 +02: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
Maxqia
fe2ce83e41
[enh] currency_convert: allow strings like google's "convert 1 euro to dollars"
2016-04-30 20:48:15 -07: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
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
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
cf09b500f3
Add support for dokuwiki engine
2016-04-03 22:03:41 +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
jibe-b
092e15cc1d
[enh] Add BASE engine in category Science. Basic and advanced search.
2016-03-29 16:17:17 +02: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
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
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
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
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
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
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
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
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
66f48c2bf5
[fix] google markup change - closes #489
2016-01-10 18:49:50 +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
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
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
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
asciimoo
7b4ec5c5e9
[fix] highlighting only html
2014-01-10 23:38:08 +01:00
Adam Tauber
1ba2762b67
Merge pull request #17 from pw3t/vimeo
...
Vimeo engine added
2014-01-08 03:05:57 -08:00
pw3t
1950e697d6
[enh] Improved vimeo search engines, and add the configuration in the sample
2014-01-06 22:15:46 +01:00
asciimoo
a5544ab95e
[enh] score per result stat added
2014-01-05 23:13:53 +01:00
pw3t
68364df342
[enh] 1st version of vimeo search engine (need improvments)
2014-01-05 22:10:46 +01:00
Adam Tauber
5c9f6d5174
Merge pull request #16 from dalf/master
...
bug fixes
2014-01-05 05:49:39 -08:00
Dalf
3dc3fc7770
[mod][fix] xpath engine simplified, yahoo engine never returns truncated urls
2014-01-05 14:06:52 +01:00
Dalf
a2928e8d83
[fix] startpage engine : characters with diacritic were preceded by whitespace, and cleaner way to parse the result.
2014-01-05 14:00:10 +01:00
Dalf
bf56ec4fb1
[mod] bing and duckduckgo engines : add / rename locale parameter
2014-01-05 13:58:17 +01:00
Dalf
49c85fce51
[fix] dailymotion engine : no more html tag in the description
2014-01-05 13:55:17 +01:00
Dalf
e88cf0a0a8
[mod] minor fixes (duckduck_definitions : if a ddg bang is in the query, avoid a useless redirect)
2014-01-05 13:50:17 +01:00
asciimoo
53878fde2d
[fix] error percentage @ stats page
2014-01-05 01:00:32 +01:00
asciimoo
d13c5aa37b
[mod] unused imports and whitespaces purged
2014-01-05 00:46:42 +01:00
pw3t
efb6eca39e
Merge branch 'master' of https://github.com/asciimoo/searx
2014-01-02 19:52:21 +01:00
asciimoo
76c9b2c782
[fix] piratebay.sx is no longer available - using piratebay.se
2013-12-31 15:35:51 +01:00
dalf
d3e272d035
add dailymotion engine
2013-12-30 22:42:37 +01:00
dalf
664c039b38
xpath engine: bug fix
2013-12-30 22:34:35 +01:00
dalf
9eddcdb8e4
flickr engine: bug fix
2013-12-30 22:24:42 +01:00
pw3t
6f2b8aca5e
[fix] fix an error in the query
2013-12-29 21:43:56 +01:00
pw3t
a492ca6ded
[enh] add support for yacy engine (localhost)
2013-12-29 21:39:23 +01:00
pw3t
b71bddad06
[enh] 1st version of filecrop engine, to discover how searx works
2013-12-29 16:30:03 +01:00
asciimoo
5f065886ff
[fix] not highlighting Nonetype
2013-12-16 14:06:53 +01:00
asciimoo
ab7fb1190d
[enh] smarter currency query parse II.
2013-12-01 16:42:37 +01:00
asciimoo
a35128f5e0
[enh] smarter currency query parse
2013-12-01 16:41:24 +01:00
asciimoo
1cb489ba1a
[enh] json engine added
2013-11-19 15:49:52 +01:00
asciimoo
3755f437e4
[fix] utf8 content highlighting
2013-11-19 11:27:17 +01:00
asciimoo
e50a72b0e3
[enh] suggestion support for xpath engine
2013-11-13 19:33:09 +01:00
asciimoo
66ff28bb9d
[enh] suggestion support added
2013-11-13 19:32:46 +01:00
asciimoo
9688495b9f
[mod] result scoring separated
2013-11-12 21:34:28 +01:00
asciimoo
1240be48fb
[fix] currency converter - valid date url param
2013-11-10 22:03:16 +01:00
asciimoo
b9ebf18f59
[fix] query highlight fix
2013-11-10 21:47:42 +01:00
asciimoo
cbb397939d
[enh] incasesensitive query highlighting
2013-11-10 21:41:01 +01:00
asciimoo
14cd1d6faf
[enh] moar weight for currency convertor
2013-11-10 21:20:22 +01:00
asciimoo
6d956a7d1d
[enh] engine score weight support @ config and engines
2013-11-10 21:16:25 +01:00
asciimoo
17bf00ee42
[enh] removing result html tags
2013-11-09 18:39:20 +01:00
asciimoo
14a53e3430
[enh] search query highlight in result texts
2013-11-09 18:37:25 +01:00
asciimoo
cfff04f7d0
[enh] currency converter engine added
2013-11-04 21:47:16 +01:00
asciimoo
1a2cf205f9
[enh] skipping empty/nonetype categories
2013-11-04 21:46:23 +01:00
asciimoo
4cc391169a
[enh] ignoring empty request urls
2013-11-04 21:06:53 +01:00
asciimoo
70278567ec
[mod] searching by selected engines
2013-11-04 00:18:07 +01:00
asciimoo
d2a952ecdf
[enh] request arg refactor
2013-11-03 00:40:45 +01:00
asciimoo
443af2ba83
[fix] varname
2013-11-03 00:34:09 +01:00
asciimoo
a8797839a1
[enh] request timeout added
2013-11-03 00:31:03 +01:00
asciimoo
c3c9d147ce
[enh] clickable youtube thumbnail
2013-11-02 18:18:45 +01:00
asciimoo
326a33fafe
[enh] better url comparison
2013-11-02 18:07:48 +01:00
asciimoo
cd268f90e2
[fix] correct scheme @ parsed url
2013-11-02 18:04:13 +01:00
asciimoo
ec95fddce2
[mod] scoring
2013-10-28 11:38:33 +01:00
asciimoo
e13fe033ed
[enh] engine exception handling ++ stats
2013-10-27 20:45:21 +01:00
asciimoo
ca0800306f
[mod] scoring mods
2013-10-27 19:06:30 +01:00
asciimoo
21e9c87305
[mod] pageload stat order
2013-10-27 14:55:47 +01:00
asciimoo
f01e67dbd4
[mod] scoring mods
2013-10-27 14:48:16 +01:00
asciimoo
0f301adf60
[enh] score stat mods
2013-10-27 14:39:23 +01:00
asciimoo
09154c1f01
[mod] results engines mods
2013-10-27 14:34:35 +01:00
asciimoo
22c94ec149
[fix] using https links
2013-10-27 14:23:53 +01:00
asciimoo
e2c1c10657
[enh] engine score stats
2013-10-27 14:21:23 +01:00
asciimoo
13a4582a40
[enh] search count
2013-10-27 13:55:18 +01:00
asciimoo
7965da55a7
[fix] urlparsing fix
2013-10-27 12:01:03 +01:00
asciimoo
afe767d8e9
[enh] stat bar graphs
2013-10-27 02:59:32 +02:00
asciimoo
4f4ec44bb3
[enh] stat updates
2013-10-27 02:50:24 +02:00
asciimoo
43ac547bc1
[enh] new stat: average request duration
2013-10-27 01:23:13 +02:00
asciimoo
b8191f43e7
[enh] engine statistics
2013-10-27 01:02:28 +02:00
asciimoo
09e7353307
[enh] config checks
2013-10-26 18:44:58 +02:00
asciimoo
5d764f95cf
[enh] xpath engine absolute xpath support
2013-10-26 13:45:43 +02:00
asciimoo
badd988545
[enh] xpath engine added
2013-10-26 02:22:20 +02:00
asciimoo
89b68242d3
[mod] var rename
2013-10-26 02:21:55 +02:00
asciimoo
34bdeda6d4
[enh] basic config check
2013-10-25 23:41:14 +02:00
asciimoo
5dcddbc0ab
[enh] engine params to response callbacks
2013-10-25 22:00:56 +02:00
asciimoo
f4fdb1e756
[fix] url encoding
2013-10-25 11:20:46 +02:00
asciimoo
d9011f673e
[fix] debug msg removed
2013-10-25 01:46:12 +02:00
asciimoo
aa41c2b8ac
[enh] bing updates ++ language support
2013-10-25 01:37:48 +02:00
asciimoo
2ca4cf7f2d
[enh] bing engine added
2013-10-24 23:52:57 +02:00
asciimoo
cf6a92a996
[fix] urljoin removed
2013-10-24 23:43:39 +02:00
asciimoo
7ddf7d43ba
[fix] character encoding fix
2013-10-24 21:00:44 +02:00
asciimoo
74b6be3991
[enh] engine cfg compatibilty
2013-10-23 23:55:37 +02:00
asciimoo
39d229e110
[enh][mod] engines.cfg support
2013-10-23 23:54:46 +02:00
asciimoo
75a2a6fb73
[enh] mediawiki engine added
2013-10-23 23:53:27 +02:00
asciimoo
e7792d77a7
[mod] wikipedia engine removed
2013-10-23 23:46:33 +02:00
asciimoo
5e358ea9a9
[enh] merging only results with same rendering templates
2013-10-23 12:24:51 +02:00
asciimoo
708fa6f88a
[fix] handling missing github descriptions
2013-10-23 12:24:09 +02:00
asciimoo
dbf1049c79
[fix] debug print removed
2013-10-22 23:36:10 +02:00
asciimoo
0d6368a092
[fix] skipping empty urls
2013-10-22 23:35:17 +02:00
asciimoo
3a6d3e3377
[enh][mod] using image template rendering
2013-10-22 23:34:45 +02:00
asciimoo
9bd4459638
[fix] description escaping
2013-10-22 23:17:22 +02:00
asciimoo
831add33f0
[enh] thumbnails to youtube video results
2013-10-22 19:36:30 +02:00
asciimoo
ea03aaecb4
[enh] magnet link added
2013-10-22 19:15:41 +02:00
asciimoo
ef7e1199c3
[enh] displaying seeders/leechers
2013-10-22 19:15:30 +02:00
asciimoo
9ad8013a45
[enh] piratebay engine added
2013-10-22 18:58:01 +02:00
asciimoo
8520be3cd6
[enh] categories to request callback
2013-10-22 18:57:20 +02:00
asciimoo
42d2cc2068
[enh] github engine added
2013-10-20 21:53:49 +02:00
asciimoo
7ce7aaed3d
[fix] handling empty resultsets III.
2013-10-20 21:40:14 +02:00
asciimoo
e1768ed292
[fix] url encoding fix
2013-10-20 21:31:16 +02:00
asciimoo
15a2c27864
[fix] link attrib
2013-10-20 20:53:12 +02:00
asciimoo
ec28b77a93
[fix] filtering
2013-10-20 20:47:00 +02:00
asciimoo
95e4a9353a
[fix] request header parametering
2013-10-20 20:20:10 +02:00
asciimoo
986c8e51a8
[fix] handling empty resultset II.
2013-10-20 20:02:20 +02:00
asciimoo
126682a6ce
[fix] handling empty resultset
2013-10-20 19:45:13 +02:00
asciimoo
f56649e3a9
[enh] deviantart engine added
2013-10-20 11:12:10 +02:00
asciimoo
c7b5cddc48
[enh] twitter engine added
2013-10-20 10:40:02 +02:00
asciimoo
7b6e5b5d14
[enh] soundcloud playlists
2013-10-20 00:52:32 +02:00
asciimoo
b9cdad9178
[mod] content formatting
2013-10-19 23:18:39 +02:00
asciimoo
4e5624a507
[mod] engine rename
2013-10-19 23:13:21 +02:00
asciimoo
83af0b6224
[enh] google images refactor
2013-10-19 23:12:18 +02:00
Adam Tauber
225c7ecbcf
Merge pull request #2 from stef/master
...
google images engine
2013-10-19 13:36:55 -07:00