summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-05[fix] settings_loader.py - use update_dict only for mapping typesMarkus Heiser
I can't set `default_doi_resolver` in `settings.yml` if I'm using `use_default_settings`. Searx seems to try to interpret all settings at root level in `settings.yml` as dict, which is correct except for `default_doi_resolver` which is at root level and a string:: File "/usr/lib/python3.9/site-packages/searx/settings_loader.py", line 125, in load_settings update_settings(default_settings, user_settings) File "/usr/lib/python3.9/site-packages/searx/settings_loader.py", line 61, in update_settings update_dict(default_settings[k], v) File "/usr/lib/python3.9/site-packages/searx/settings_loader.py", line 48, in update_dict for k, v in user_dict.items(): AttributeError: 'str' object has no attribute 'items' Signed-off-by: Markus Heiser <markus@darmarit.de> Suggested-by: @0xhtml https://github.com/searx/searx/issues/2722#issuecomment-813391659
2021-04-05Merge pull request #2656 from return42/fix-url_forAlexandre Flament
[fix] url_for(..., _external=True) in templates
2021-04-05[fix] url_for(..., _external=True) in templatesMarkus Heiser
The `url_for` function in the template context is not the one from Flask, it is the one from `webapp`. The `webapp.url_for_theme` is different from its namesake of Flask and has it quirks, when called with argument `_external=True`. The `webapp.url_for_theme` can't handle absolute URLs since it pokes a leading '/', here is the snippet of the old code:: url = url_for(endpoint, **values) if settings['server']['base_url']: if url.startswith('/'): url = url[1:] url = urljoin(settings['server']['base_url'], url) Next drawback of (Flask's) `_external=True` is, that it will not return the HTTP scheme when searx (the Flask app) listens on http and is proxied by a https server. To get the right scheme `HTTP_X_SCHEME` is needed by Flask (werkzeug). Since this is not provided in every environment (e.g. behind Apache mod_wsgi or the HTTP header is not fully set for some other reasons) it is recommended to get *script_name*, *server* and *scheme* from the configured `base_url`. If `base_url` is specified, then these values from are given preference over any Flask's generics. BTW this patch normalize to use `url_for` in the `opensearch.xml` and drop the need of `host` and `urljoin` in template's context. Signed-off-by: Markus Heiser <markus@darmarit.de>
2021-04-05[enh] oscar: image thumbnail layoutAlexandre Flament
Adjust thumbnail sizes to fill the container width
2021-04-05Allow overriding Docker repository when building docker image3nprob
2021-04-05Reduce redundant docker build steps3nprob
2021-04-04Merge pull request #2718 from return42/fix-publishedDateNoémi Ványi
[fix] publishedDate: don't try to get date from empty string or None
2021-04-04Merge pull request #2707 from return42/fix-doi-defaultNoémi Ványi
[fix] default_doi_resolver in preferences
2021-04-04[fix] default_doi_resolver in preferencesMarkus Heiser
Instead of a hard-coded `oadoi.org` default, use the default value from `settings.yml`. Fix an issue in the themes: The replacement 'current_doi_resolver' contains the doi_resolver_url, not the name of the DOI resolver. Compare return value of:: searx.plugins.oa_doi_rewrite.get_doi_resolver(...) Fix a typo in `get_doi_resolver(..)`: suggested by @kvch: *L32 should set doi_resolver not doi_resolvers* Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-04-04[fix] publishedDate: don't try to get date from empty string or NoneMarkus Heiser
Signed-off-by: Markus Heiser <markus@darmarit.de>
2021-04-03Merge pull request #2685 from searx/dependabot/pip/master/sphinx-3.5.3Noémi Ványi
Bump sphinx from 3.5.2 to 3.5.3
2021-04-03Bump sphinx from 3.5.2 to 3.5.3dependabot[bot]
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.5.2 to 3.5.3. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES) - [Commits](https://github.com/sphinx-doc/sphinx/commits) Signed-off-by: dependabot[bot] <support@github.com>
2021-04-03Merge pull request #2666 from ↵Noémi Ványi
searx/dependabot/pip/master/sphinx-autobuild-2021.3.14 Bump sphinx-autobuild from 2020.9.1 to 2021.3.14
2021-04-03Bump sphinx-autobuild from 2020.9.1 to 2021.3.14dependabot[bot]
Bumps [sphinx-autobuild](https://github.com/executablebooks/sphinx-autobuild) from 2020.9.1 to 2021.3.14. - [Release notes](https://github.com/executablebooks/sphinx-autobuild/releases) - [Changelog](https://github.com/executablebooks/sphinx-autobuild/blob/main/NEWS.rst) - [Commits](https://github.com/executablebooks/sphinx-autobuild/commits) Signed-off-by: dependabot[bot] <support@github.com>
2021-04-03Merge pull request #2715 from ↵Noémi Ványi
searx/dependabot/pip/master/sphinxcontrib-programoutput-0.17 Bump sphinxcontrib-programoutput from 0.16 to 0.17
2021-04-03Merge pull request #2714 from searx/dependabot/pip/master/pylint-2.7.4Noémi Ványi
Bump pylint from 2.7.2 to 2.7.4
2021-04-03Bump pylint from 2.7.2 to 2.7.4dependabot[bot]
Bumps [pylint](https://github.com/PyCQA/pylint) from 2.7.2 to 2.7.4. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/master/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.7.2...pylint-2.7.4) Signed-off-by: dependabot[bot] <support@github.com>
2021-04-03Bump sphinxcontrib-programoutput from 0.16 to 0.17dependabot[bot]
Bumps [sphinxcontrib-programoutput](https://github.com/NextThought/sphinxcontrib-programoutput) from 0.16 to 0.17. - [Release notes](https://github.com/NextThought/sphinxcontrib-programoutput/releases) - [Changelog](https://github.com/NextThought/sphinxcontrib-programoutput/blob/master/CHANGES.rst) - [Commits](https://github.com/NextThought/sphinxcontrib-programoutput/compare/0.16...0.17) Signed-off-by: dependabot[bot] <support@github.com>
2021-04-03Merge pull request #2712 from searx/update_data_update_firefox_version.pyNoémi Ványi
Update searx.data - update_firefox_version.py
2021-04-03Merge pull request #2710 from searx/update_data_update_ahmia_blacklist.pyNoémi Ványi
Update searx.data - update_ahmia_blacklist.py
2021-04-03Merge pull request #2709 from searx/update_data_update_currencies.pyNoémi Ványi
Update searx.data - update_currencies.py
2021-04-03Merge pull request #2711 from searx/update_data_update_wikidata_units.pyNoémi Ványi
Update searx.data - update_wikidata_units.py
2021-04-03Merge pull request #2713 from searx/update_data_update_languages.pyNoémi Ványi
Update searx.data - update_languages.py
2021-04-03[fix] url bar autocomplete (opensearch suggestions)Markus Heiser
Since #2593 is merged the OpenSearch-Format is buggy. The loop in [1] will change raw_text_query object and this will change also the value of `raw_text_query.query` on every `raw_text_query.changeQuery(result)`. This patch fixes this issue by storing the initial query value in `sug_prefix`. [1] https://github.com/searx/searx/blob/ac0fdc3b9670168de8061ed0e656dd66a567d741/searx/webapp.py#L804-L806 OpenSearch-Format:: [ "<query>", [ "<term 1>", "<term 2>", ... "<term n>" ], [ "<content 1>", "<content 2>", ..., "<content n>" ], [ "<url 1>", "<url 2>", ..., "<url n>" ] ] - https://www.google.com/support/enterprise/static/gsa/docs/admin/current/gsa_doc_set/xml_reference/query_suggestion.html#1080002 - https://developer.mozilla.org/en-US/docs/Archive/Add-ons/Supporting_search_suggestions_in_search_plugins#implementing_search_suggestion_support_on_the_server Legacy-Format:: [ "<term 1>", "<term 2>", ..., "<term n>" ] - https://www.google.com/support/enterprise/static/gsa/docs/admin/current/gsa_doc_set/xml_reference/query_suggestion.html#1081079 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-04-02Merge pull request #2702 from MarcAbonce/fix-dark-infoboxAlexandre Flament
Fix dark "expand" button from infobox
2021-04-01Update searx.data - update_languages.pydalf
2021-04-01Update searx.data - update_firefox_version.pydalf
2021-04-01Update searx.data - update_wikidata_units.pydalf
2021-04-01Update searx.data - update_ahmia_blacklist.pydalf
2021-04-01Update searx.data - update_currencies.pydalf
2021-03-28fix dark "expand" button from infoboxMarc Abonce Seguin
2021-03-27[enh] release v1.0.0Adam Tauber
2021-03-27[doc] add new contributors to the authors fileAdam Tauber
new contributors: - @cyclaero - @thezeroalpha - @Tobi823 - @archiecodes - @BBaoVanC - @datagram1 - @lucky13820 - @jhigginbotham - @xenrox - @OliveiraHermogenes
2021-03-27[enh] update translations from transifexAdam Tauber
2021-03-27Merge pull request #2682 from dalf/fix-checkerAlexandre Flament
[fix] checker: various bug fixes
2021-03-27Merge pull request #2681 from dalf/fix-wikipedia-titleAlexandre Flament
[fix] wikipedia: remove HTML from the title
2021-03-27Remove duplicated key from dict in Semantic ScholarNoémi Ványi
2021-03-27fix Semantic Scholar engineNoémi Ványi
2021-03-27[fix] update seznam engine to be compatible with the new websiteAdam Tauber
2021-03-26Merge pull request #2684 from searx/dependabot/pip/master/linuxdoc-20210324Alexandre Flament
Bump linuxdoc from 20210110 to 20210324
2021-03-26Bump linuxdoc from 20210110 to 20210324dependabot[bot]
Bumps [linuxdoc](https://github.com/return42/linuxdoc) from 20210110 to 20210324. - [Release notes](https://github.com/return42/linuxdoc/releases) - [Commits](https://github.com/return42/linuxdoc/commits) Signed-off-by: dependabot[bot] <support@github.com>
2021-03-26Merge pull request #2683 from searx/dependabot/pip/master/lxml-4.6.3Alexandre Flament
Bump lxml from 4.6.2 to 4.6.3
2021-03-26Bump lxml from 4.6.2 to 4.6.3dependabot[bot]
Bumps [lxml](https://github.com/lxml/lxml) from 4.6.2 to 4.6.3. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.2...lxml-4.6.3) Signed-off-by: dependabot[bot] <support@github.com>
2021-03-25[mod] Dockerfile: remove protobuff dependencyAlexandre Flament
See https://github.com/searx/searx/pull/2481
2021-03-25[fix] checker: various bug fixesAlexandre Flament
* initialize engine_data (youtube engine) * don't crash if an engine don't set result['url']
2021-03-25[fix] wikipedia: remove HTML from the titleAlexandre Flament
fr.wikipedia.org (and it seems not other wikipedia websites), adds HTML to api_result['displayTitle']. (Search for '!wp :fr Braid' for example) The commit uses api_result['title']
2021-03-25[mod] increase lobste.rs engine timeout to avoid timeouts most of the timeAdam Tauber
2021-03-25[fix] make ina engine compatible with the new response jsonAdam Tauber
2021-03-25[fix] rewrite hoogle to use html/xpath instead of jsonAdam Tauber
the json response has been changed and it contains html chunks which is not compatible with our json engine, so we have to switch to html/xpath parsing
2021-03-25[fix] update geektimes.ru url - it redirects to habr.comAdam Tauber