Commit Graph

3302 Commits

Author SHA1 Message Date
Markus Heiser 0a7479f194 doc: [fix] WARNING: Could not lex literal_block as "json"
docs/admin/filtron.rst:24: \
   WARNING: Could not lex literal_block as "json". Highlighting skipped.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-12 13:24:18 +01:00
Markus Heiser af2cae6d1d doc: make use of sphinx.ext.extlinks & sphinx.ext.intersphinx
- add sphinx extensions
- patch documentation to make use of

These modules help to simplify the reST markup of external references.  BTW it
helps to write more readable reST and form custom brands.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-12 12:39:38 +01:00
Markus Heiser 25fa7da6c8 doc: use customized pocoo theme (pallets-sphinx-themes)
The old searx theme was a copy of the flask theme.  In the meantime this theme
is available from the python module pallets-sphinx-themes.

This patch makes pallets-sphinx-themes as a (dev) requirement and drops most of
the old and obsolete searx theme settings/files.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-12 12:21:52 +01:00
Markus Heiser ef85943e06 Makefile: add documentation build targets docs & docs-live
BTW:
- add build & dist folder to .gitignore
- justify indentation of build messages (makefile.python)

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-12 12:10:32 +01:00
Markus Heiser bb2b9b8da4 utils: add makefile.sphinx to the boilerplate
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-12 11:48:51 +01:00
Markus Heiser 49e8dd1e0d doc: move patches from /doc folder of branch gh-pages to master
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-12 11:19:26 +01:00
Adam Tauber 3f93fe04d8
Merge pull request #1752 from MarcAbonce/user-agents-update
User agents update
2019-12-11 15:45:02 +00:00
Adam Tauber b0177847f8
Merge pull request #1763 from return42/dos2unix
themes: remove CR from newlines
2019-12-11 15:43:38 +00:00
Dalf 0e7b6c9a03 [mod] infinite scroll: XHR requests are sent with the header "Accept: text/html".
Fix https://github.com/searx/searx-docker/issues/16
2019-12-11 14:34:25 +01:00
Markus Heiser a3b5f3230c theme: oscar - remove dust (comes from PR #1671 implementation)
was inadvertently included in the commit [1]

[1] f34ac58752 (diff-0243d1c24e9981002156cc87cc10bd53R103)

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-10 18:33:36 +01:00
Markus Heiser f373169c84 theme: oscar - add accesskey to input tags
l - language field
s - search field
t - time range field

The way to activate the accesskey depends on the browser and its platform [1]

[1] https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-10 18:20:51 +01:00
Markus Heiser 57c6fa6e63 theme: oscar - fix auto-submit on language seletion
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-10 18:16:45 +01:00
Markus Heiser 2a5c39e33c theme: oscar - tidy up trailing whitespaces and tab usage
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-10 18:10:33 +01:00
Markus Heiser 9988cdcbc5 Merge branch 'master' of https://github.com/asciimoo/searx into dos2unix
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-10 17:35:23 +01:00
Markus Heiser 50e1fcaa5e
Merge pull request #1671 from dalf/tidy-oscar
[mod] tidy oscar HTML output
2019-12-10 16:02:54 +00:00
Markus Heiser 7fbb15e050
Merge branch 'master' into tidy-oscar 2019-12-10 15:41:06 +00:00
Adam Tauber f7a0510ac0
Merge pull request #1756 from return42/boilerplate
RFC: Makefile based boilerplate for python projects
2019-12-10 15:14:18 +00:00
Markus Heiser 7beb49b1fb
Merge branch 'master' into boilerplate 2019-12-10 13:10:51 +00:00
Dalf f34ac58752 [mod] tidy oscar HTML output 2019-12-10 10:58:30 +01:00
Adam Tauber e9311ee776 [enh] add @pofilo & @return42 to maintainers 2019-12-09 18:10:03 +01:00
Adam Tauber 4cddb829f9
Merge pull request #1628 from MarcAbonce/google_fix
[fix] Update xpaths for new Google results page
2019-12-09 12:49:11 +00:00
Markus Heiser 56b7e05721 themes: remove CR from newlines
Adding a CR in  some files and in others not,  is  a good starting point for a
DOS+Unix mess we all have already seen in many projects.

Patch fixes all files matching (even those comming from grunt's build)::

   find ./searx -exec file {} \; | grep CR

BTW: Same with mixing TAB and SPACE indent styles in one and the same file.  So
if sources are tuched here in this patch, its also fixed.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-08 15:33:46 +01:00
Marc Abonce Seguin ccaf6ca02c [fix] update xpaths for new google results page 2019-12-07 16:37:24 -07:00
Markus Heiser 1b90e1403b Merge branch 'master' of https://github.com/asciimoo/searx into boilerplate 2019-12-03 11:38:52 +01:00
Adam Tauber 1bb46e5e37
Merge pull request #1680 from robbyoconnor/patch-1
Add --no-cache to tell apk to not cache packages
2019-12-02 13:42:33 +00:00
Adam Tauber 1da10f2960
Merge pull request #1736 from x250/master
Mojeek engine hotfix
2019-12-02 13:40:30 +00:00
Adam Tauber 731e34299d
Merge pull request #1744 from dalf/optimizations
[mod] speed optimization
2019-12-02 13:39:58 +00:00
Adam Tauber 574cb25a16
Merge pull request #1758 from return42/ddd-fix
[fix] duckduckgo_definitions
2019-12-02 13:38:54 +00:00
Markus Heiser 30ad0c666d duckduckgo_definitions: remove the debug message
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-02 14:26:11 +01:00
Adam Tauber 20da8f2cbf
Merge pull request #1754 from MarcAbonce/seedpeer
Add Seedpeer again
2019-12-02 13:09:09 +00:00
Adam Tauber 349697e803
Merge pull request #1757 from return42/fix-sc-id
[fix] soundcloud: URLs of JS sources has been moved
2019-12-02 13:05:49 +00:00
Markus Heiser b6d9f5aa71 [fix] duckduckgo_definition issues reported by 'manage.sh test'
Fix this error while travis build::

  /home/travis/build/asciimoo/searx/searx/engines/duckduckgo_definitions.py:21:44: E225 missing whitespace around operator

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-29 19:59:35 +01:00
Markus Heiser 4998e9ec85 [fix] duckduckgo_definitions - where 'AnswerType' is 'calc'
Do not try to get text when 'AnswerType' is 'calc'.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-29 19:20:14 +01:00
Markus Heiser 2aa95c16e3 [fix] soundcloud: URLs of JS sources has been moved
The client_id is found under (new) URL:

  https://a-v2.sndcdn.com/assets/49-a0c01933-3.js

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-29 15:05:36 +01:00
Markus Heiser 52450fd08a .dir-locals.el: add some comments about jedi & EPC
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-29 13:15:15 +01:00
Markus Heiser 147f40c386 Merge branch 'master' of https://github.com/asciimoo/searx into boilerplate 2019-11-28 20:38:29 +01:00
Adam Tauber 8721be2f7d
Merge pull request #1682 from Venca24/devel_mojeek
[fix] mojeek engine
2019-11-28 19:33:08 +00:00
Adam Tauber 789d71350d
Merge pull request #1745 from lorddavidiii/python3.8-fix
Fix python 3.8 compatibility
2019-11-28 19:31:59 +00:00
Markus Heiser 62a4b7443f boilerplate: add .dir-locals.el with emacs python enviroment
The .dir-locals.el set the project's python enviroment for the emacs tasks like
flycheck or jedi.  The py-environment has to be next to <repo>/.dir-locals.el::

    ./local/py3

To setup such an environment build target 'pyenv' or 'pyenvinstall'::

  $ make pyenvinstall

TL;DR

Alternatively create the virtualenv, source it and install jedi + epc
(required by `emacs-jedi <https://tkf.github.io/emacs-jedi>`_)::

    $ virtualenv --python=python3  "--no-site-packages" ./local/py3
    ...
    $ source ./local/py3/bin/activate
    (py3)$ # now install into the activated 'py3' environment ..
    (py3)$ pip install jedi epc
    ...

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-28 20:08:44 +01:00
Markus Heiser 796197db2d boilerplate: add pylint / WIP: balance linting with pylint
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-28 20:07:10 +01:00
Markus Heiser 7e572a2453 Makefile: add test.pep8 test.unit test.robot (from manage.sh)
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-28 20:05:29 +01:00
Markus Heiser b55a8004ed boilerplate: add inital Makefile with run & install targets
Add *Makefile* boilerplate useful for python projects.  All python tasks are
using a virtualenv from ./local/py3

$ make help
  run       - run developer instance
  install   - developer install (./local)
  uninstall - uninstall (./local)

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-28 19:54:57 +01:00
Markus Heiser a56c56ead3 seatup.py: fix [dev_]requirements and open file with context
setup(..) named arguments 'install_requires' and 'extras_require' need lists
arguments, the <map object> is ignored when installing extra environment
'test'::

  pip install -e .\[test\]

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-11-28 19:22:03 +01:00
Adam Tauber 05033ea8d8
Merge pull request #1689 from MarcAbonce/images_fixes
[fix] Google Images
2019-11-26 13:20:19 +00:00
Adam Tauber 2a527b8187
Merge pull request #1749 from unixfox/patch-1
[fix] Force Google old UI with a new user agent
2019-11-26 13:10:34 +00:00
Marc Abonce Seguin 9299355570 add seedpeer again 2019-11-24 22:01:44 -07:00
Marc Abonce Seguin d0d91fa331 update user agents 2019-11-23 19:27:49 -07:00
Marc Abonce Seguin 94ca30de1b add a shortcut for utils/fetch_firefox_version.py in manage.sh 2019-11-23 19:26:48 -07:00
Emilien Devos 8f51430f5c [fix] Force Google old UI with a new user agent 2019-11-22 23:01:41 +01:00
lorddavidiii 5e5ff0cbf8 webapp.py: use html.escape if cgi.escape is not available
- cgi.escape was removed in python 3.8
- also use html.escape in framalibre.py
2019-11-16 21:58:25 +01:00