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

5454 Commits

Author SHA1 Message Date
Alexandre Flament 577998106a [mod] debug mode: use coloredlogs package 
in debug mode, add some padding to make the output more readable
in procution mode, add the timestamp
 2021-09-10 21:49:34 +02:00
Alexandre Flament b513917ef9 [mod] searx.metrics & searx.search: use the engine loggers 
metrics & processors use the engine logger
 2021-09-10 21:49:34 +02:00
Markus Heiser 76e0f6807c
Merge pull request #311 from dalf/fix-pr-302 
[fix] searx/results.py: strip result['content'] only if it exists
 2021-09-10 16:10:33 +00:00
Alexandre Flament d9658a7f91 [fix] searx/results.py: strip result['content'] only if it exists 
fix PR #302
 2021-09-10 17:58:19 +02:00
Markus Heiser 13a4d20e8d
Merge pull request #306 from dalf/docs-brand 
[doc] searxng brand
 2021-09-10 15:42:20 +00:00
Alexandre Flament 75daef8986
Merge pull request #309 from searxng/ci-python-3.10.0-rc.2 
[ci] add Python 3.10.0-rc.2
 2021-09-10 13:20:41 +02:00
Alexandre Flament ca73a37679
[ci] add Python 3.10.0-rc.2 2021-09-10 13:13:49 +02:00
Alexandre Flament 4833d85e2e [doc] update copyright notice and HTML title 2021-09-10 11:49:57 +02:00
Markus Heiser b671e0364f
Merge pull request #302 from dalf/mod_plugin_on_result 
[mod] plugin: call on_result for each result of each engines.
 2021-09-10 09:20:26 +00:00
Alexandre Flament 0b27c8698f [doc] update docs/dev/plugins.rst 2021-09-10 10:58:22 +02:00
Markus Heiser 449ff70898
Merge pull request #307 from dalf/remove-transifex-ref 
[fix] remove references to transifex
 2021-09-10 07:14:07 +00:00
Alexandre Flament 70c9bb6f2c [fix] remove references to transifex 2021-09-09 21:29:55 +02:00
Alexandre Flament b941763e20 [mod] ahmia_filter: use on_result instead of post_search 
see commit 6c9ae7911e9639bc46cd53af215734b4bdb61ba9
 2021-09-09 11:31:46 +02:00
Alexandre Flament 660c180170 [mod] plugin: call on_result after each engine from the ResultContainer 
Currently, searx.search.Search calls on_result once the engine results have been merged
(ResultContainer.order_results).

on_result plugins can rewrite the results: once the URL(s) are modified, even they can be merged,
it won't be the case since ResultContainer.order_results has already be called.

This commit call on_result inside for each result of each engines.
In addition the on_result function can return False to remove the result.

Note: the on_result function now run on the engine thread instead of the Flask thread.
 2021-09-09 11:31:44 +02:00
Alexandre Flament 1973e4ecf6
Merge pull request #303 from return42/fix-README 
[fix] README - fix minor typo
 2021-09-08 09:39:45 +02:00
Markus Heiser dad82cac1a [fix] README - fix minor typo 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-08 09:00:48 +02:00
Alexandre Flament fc20c561bf [mod] oa_doi_rewrite plugin: get_doi_resolver: remove args parameter 
doi_resolvers.get_value('preferences') already contains the value from
request.args.get('doi_resolver')
 2021-09-07 19:14:36 +02:00
Alexandre Flament a3789b3bb4
Merge pull request #295 from return42/fix-csp-2 
[fix] make HTML templates more CSP compliant
 2021-09-07 18:51:00 +02:00
Markus Heiser b0623ac9f6 [build] /static 2021-09-07 17:48:56 +02:00
Markus Heiser 0240ca9567 [fix] oscar template - merge the two class attributes into one 
Suggested-by: @dalf https://github.com/searxng/searxng/pull/295#discussion_r703337237
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 16:46:49 +02:00
Markus Heiser bd830f7449 [fix] simple theme - preferences: fix tooltip overflow 
Suggested-by: @dalf https://github.com/searxng/searxng/pull/295#discussion_r703370358
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 16:46:49 +02:00
Alexandre Flament e41f78b806
Merge pull request #301 from return42/fix-lintrc 
[pylint] .pylintrc - disable missing-function-docstring
 2021-09-07 15:09:40 +02:00
Markus Heiser 2a3b9a2e26 [pylint] searx: drop no longer needed 'missing-function-docstring' 
Suggested-by: @dalf https://github.com/searxng/searxng/issues/102#issuecomment-914168470
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 13:34:35 +02:00
Markus Heiser f0059b80ed [pylint] engines: drop no longer needed 'missing-function-docstring' 
Suggested-by: @dalf https://github.com/searxng/searxng/issues/102#issuecomment-914168470
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 13:26:59 +02:00
Markus Heiser 5c86754340 [pylint] .pylintrc - disable missing-function-docstring 
Suggested-by: @dalf https://github.com/searxng/searxng/issues/102#issuecomment-914168470
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 13:25:26 +02:00
Markus Heiser 9068a72c6a [fix] oscar theme - preferences: rename col-checkbox/col-stat 
[1] https://github.com/searxng/searxng/pull/295#discussion_r703318053
[2] https://github.com/searxng/searxng/pull/295#discussion_r703337237

Suggested-by: @dalf [1] [2]
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 12:26:07 +02:00
Alexandre Flament 9ef7f38e4f
Merge pull request #300 from return42/fix-engine-pylint 
[fix] drop useless pylint: disable=undefined-variable
 2021-09-07 10:43:16 +02:00
Markus Heiser 82847df300 [fix] add 'categories' to PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES 
androp no longer needed (see line 591 in 7b235a1)::

    # pylint: disable=undefined-variable

Suggested-by: @dalf https://github.com/searxng/searxng/issues/102#issuecomment-914068609
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 10:29:38 +02:00
Markus Heiser cd033b5416 [fix] drop useless pylint: disable=undefined-variable 
Since 7b235a1 (see line 591) it is no longer needed to disable
'undefined-variable' for names defined in::

   PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES

Suggested-by: @dalf https://github.com/searxng/searxng/issues/102#issuecomment-914068609
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 10:26:15 +02:00
Markus Heiser 222031e975 [fix] make oscar theme more CSP compliant - col-checkbox 
Add col-checkbox in::

    searx/static/themes/oscar/src/less/preferences.less

Replaced style in file::

    searx/templates/oscar/preferences.html

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 08:24:48 +02:00
Markus Heiser 9d106ae972 [fix] make oscar theme more CSP compliant - default-image-style 
Add default-image-style in::

    searx/static/themes/oscar/src/less/result_templates.less

Replaced style= in files::

    ./oscar/result_templates/default.html:19:        <img src="{{ image_proxify(result.img_src or result.thumbnail) }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content">
    ./oscar/result_templates/files.html:24:<img src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content">

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 08:20:30 +02:00
Markus Heiser e564cef0fe [fix] make /preferences more CSP compliant - simple & oscar theme 
In simple & oscar theme remove ``style=`` properties which violates CSP but seem
not to have a magnification in GUI (UX).

Fixed files::

    ./oscar/preferences.html:25:<td class="{{ label }}" style="padding: 2px">{{- "" -}}
    ./simple/preferences.html:39:<td class="{{ label }}" style="padding: 2px; width: 13rem;">{{- "" -}}
    ./simple/preferences.html:77:    <div class="engine-tooltip" style="right: 12rem;" role="tooltip" id="{{engine_name}}_reliability">
    ./simple/preferences.html:258:     <p class="text-muted" style="margin:20px 0;">

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-07 08:20:30 +02:00
Alexandre Flament f869e73d2f
Merge pull request #299 from dalf/fix-osm-workaround 
[fix] fix openstreetmap engine
 2021-09-06 22:54:27 +02:00
Alexandre Flament ea60c03827 [fix] fix openstreetmap engine 
close #298

This is a workaround: inside engine code, any call to function in another engine can crash
since the logger won't be initialized except if it is done explicitly.
 2021-09-06 22:44:22 +02:00
Alexandre Flament b57d776edb
Merge pull request #293 from dalf/fix-290 
[fix] translation: lock weblate only when there is an actual change of messages.pot
 2021-09-06 20:00:19 +02:00
Alexandre Flament 17e739a859
Merge pull request #296 from return42/engine-logger 
one logger per engine
 2021-09-06 19:50:58 +02:00
Markus Heiser aecfb2300d [mod] one logger per engine - drop obsolete logger.getChild 
Remove the no longer needed `logger = logger.getChild(...)` from engines.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-06 18:05:46 +02:00
Markus Heiser 7b235a1c36 [mod] one logger per engine 
Suggested-by: @dalf in https://github.com/searxng/searxng/issues/98#issuecomment-849013518
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-06 17:47:28 +02:00
Alexandre Flament 2a5f690a71 [fix] translation: lock weblate only when there is an actual change of messages.pot 
Close #290
 2021-09-06 17:16:51 +02:00
Alexandre Flament a26e4eff10
Merge pull request #292 from return42/fix-csp 
[fix] make HTML templates more CSP compliant
 2021-09-06 11:45:15 +02:00
Markus Heiser 0d070fde92 [build] /static 2021-09-06 11:12:17 +02:00
Markus Heiser ad528c706e [fix] make result template map more CSP compliant - simple & oscar 
Add osm-map-box in::

    searx/static/themes/__common__/less/result_templates.less

Replaced sty= in files::

    ./oscar/result_templates/map.html:64:        <div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>
    ./simple/result_templates/map.html:65:    <div id="result-map-{{ index }}" class="invisible"><div id="osm-map-{{ index }}" style="height:300px; width:100%; margin: 10px 0;" ></div></div>

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-06 11:08:50 +02:00
Markus Heiser 48c806954e [fix] make /preferences more CSP compliant - simple & oscar theme 
in simple & oscar theme replace bar-graph's *styles* by CSP compliant
implementation in::

    searx/static/themes/__common__/less/stats.less

Fixed files::

    ./oscar/preferences.html:29:        <span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}}
    ./oscar/preferences.html:30:        <span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}}
    ./oscar/preferences.html:31:        <span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}}
    ./simple/preferences.html:43:        <span style="width: calc(max(2px, 100%*{{ (stats[engine_name].time / max_rate95)|round(3) }}))" class="stacked-bar-chart-median"></span>{{- "" -}}
    ./simple/preferences.html:44:        <span style="width: calc(100%*{{ ((stats[engine_name].rate80 - stats[engine_name].time) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate80"></span>{{- "" -}}
    ./simple/preferences.html:45:        <span style="width: calc(100%*{{ ((stats[engine_name].rate95 - stats[engine_name].rate80) / max_rate95)|round(3) }})" class="stacked-bar-chart-rate95"></span>{{- "" -}}

Reported-by: https://github.com/searxng/searxng/issues/57
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-06 11:08:50 +02:00
Alexandre Flament 33ea1d5909
Merge pull request #289 from return42/fix-xpath 
[fix] remove minimum length of content for XPath engine
 2021-09-04 15:34:18 +02:00
Alexandre Flament 39bbd15b39
Merge pull request #287 from return42/azlyrics 
[enh] add engine AZLyrics.com (XPath)
 2021-09-04 13:36:09 +02:00
Alexandre Flament 3b1acdd5c5
Merge pull request #288 from return42/enh-brave 
[enh] add suggestions to brave engine
 2021-09-04 13:25:42 +02:00
Markus Heiser 9ff881f937 [fix] remove minimum length of content for XPath engine 
Instead of raising an exception and therefore hiding all results of the engine.

It make sense to remove that requirement in order to allow the implementation of
search engines that do not always have a description.  In fact some search
engines that in 99% of the case have a description like Brave Search or Mojeek
crash completely if they for some reason included a result with no description.

To test this patch try Mojeek:

    !mjk xyz

before and after the patch.

Suggested-by: 0xhtml in https://github.com/searx/searx/discussions/2933
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-04 12:41:23 +02:00
Markus Heiser 730073b850 [enh] add suggestions to brave engine 
Suggestions should be added too.

    suggestion_xpath: //div[@class="text-gray h6"]/a

You can try it with:

    !brave recurzuoin

Suggested-by: @allendema in https://github.com/searx/searx/issues/2857#issuecomment-904837023
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-04 11:38:59 +02:00
Allen 0648757e7f [enh] add engine AZLyrics.com (XPath) 
Upstream example query:
  https://search.azlyrics.com/search.php?q=The+verbal+acupunture&w=lyrics&p=1

Cherry picked from [1] and slightly modified to pass yamllint test.

[1] https://github.com/allendema/searx/commit/8b6d5a0e5

Reviewed-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-09-04 10:58:34 +02:00
Markus Heiser 018537080c
Merge pull request #286 from return42/patches-from-allendema 
Cherry pick some fixes from @allendema
 2021-09-04 08:42:46 +00:00