kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-05 12:50:11 +01:00
Code
5,299 Commits 7 Branches 17 Tags 128 MiB
3c4f5d9e2f
Commit Graph

5299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Heiser
3c4f5d9e2f
Merge pull request #567 from searxng/need-translators 
README.rst: add translation status
 2021-12-01 07:23:37 +01:00
Alexandre Flament
eb7ccb7e79
README.rst: add translation status 
Related to https://github.com/searxng/searxng/issues/540
 2021-12-01 00:08:44 +01:00
Alexandre Flament
632ae7d175
Merge pull request #562 from return42/fix-img-alt 
[simple] ImageLayout.watch: `img_load_error.svg` if img load fails
 2021-11-30 20:21:03 +01:00
Markus Heiser
4798acc661 [build] /static 2021-11-30 12:43:18 +01:00
Markus Heiser
7dc9cc91a8 [mod] simple theme, JS: introduce window.searxng.theme namespace 
In window.searxng.theme the theme data can be passed through to JS
implementations.

Initial the window.searxng.theme namespace starts with a value for
`img_load_error`::

    // image that is displayed if load of <img src='...'> failed
    img_load_error: 'img/img_load_error.svg'

The searx/static/themes/__common__/js/image_layout.js is patched to uses the
value, if the theme defines a value for img_load_error in this namespace.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-30 12:42:52 +01:00
Markus Heiser
eff0884498 [simple] ImageLayout.watch: img_load_error.svg if img load fails 
Show default image `img/img_load_error.svg` when image can't be loaded.

----
Some words about class ImageLayout:

The https://github.com/searxng/searxng/blob/master/searx/static/themes/simple/js/searxng.js is build by a grunt task ..

d0e21a01b4/searx/static/themes/simple/gruntfile.js (L91-L93)

The `/__common__/js/*.js` concats also https://github.com/searxng/searxng/blob/master/searx/static/themes/__common__/js/image_layout.js where a modified copy of the of the "Google-image-layout" (`ImageLayout`) is implemented [1][2][3].

[1] https://ptgamr.github.io/2014-09-12-google-image-layout/
[2] https://ptgamr.github.io/google-image-layout/src/google-image-layout.js
[3] https://github.com/ptgamr/google-image-layout/tree/master
----

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 21:10:13 +01:00
Markus Heiser
0311eba538
Merge pull request #556 from return42/fix-tooltip 
[simple theme] fix tooltip and improve background of an transparent image in the !images results
 2021-11-29 21:07:14 +01:00
Markus Heiser
f8c3acd729 [build] /static 2021-11-29 20:48:38 +01:00
Markus Heiser
fb5c1ed310 [fix] simple theme: set img background color to wallpaper's color 
The *background color* of an transparent image is the color of the color of
wallpaper on which all images are shown on.

Set variable `--color-result-image-background` and `--color-base-background` to
the same value.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:47:37 +01:00
Markus Heiser
c7bb6945d1 [fix] simple theme: img tile, shows duplicate information on screen 
Remove global title attribute from img tag[1][2] .  In the image result, the
title is already shown from span class title::

    <span class="title">{{ result.title|striptags }}</span>

See commit: 8fbffb1409

    [fix] simple-theme templates: polish HTML <img> elements

[1] https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
[2] https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#attr-title

Reported-by: @dalf https://github.com/searxng/searxng/pull/545#issuecomment-980531215
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:47:37 +01:00
Markus Heiser
935e5ad417
Merge pull request #558 from return42/svg-favicon 
[enh] add SVG favicon href="favicon.svg" type="image/svg+xml"
 2021-11-29 20:46:07 +01:00
Markus Heiser
0afcde071c [build] /static 2021-11-29 20:37:23 +01:00
Markus Heiser
944b73511a [enh] add SVG favicon href="favicon.svg" type="image/svg+xml" 
Add link::

    <link rel="icon" href="favicon.png" sizes="any">
    <link rel="icon" href="favicon.svg" type="image/svg+xml">

Modern browsers should request::

    INFO  werkzeug   : 127.0.0.1 - - [28/Nov/2021 17:03:07] "GET /static/themes/simple/img/favicon.svg HTTP/1.1" 200 -

[1] https://github.com/audreyfeldroy/favicon-cheat-sheet#svg-file
[2] https://dev.to/masakudamatsu/favicon-nightmare-how-to-maintain-sanity-3al7

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 20:36:31 +01:00
Markus Heiser
989f9e97f0
Merge pull request #561 from return42/fix-README 
[brand] README: add SearXNG logo
 2021-11-29 20:05:54 +01:00
Markus Heiser
e2e585319e [build] /static 2021-11-29 19:53:28 +01:00
Markus Heiser
9349c71c54 [mod] themes/simple/img/searxng.svg -> src/brand/searxng.svg 
* move `searx/static/themes/simple/img/searxng.svg` to `src/brand/searxng.svg`

* README.rst can use it without a reference to a theme.

* the simple theme can create `searx/static/themes/simple/img/searxng.png` using
  the svg2png task

Suggested-by: @dalf https://github.com/searxng/searxng/pull/561#issuecomment-981747902
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 19:53:28 +01:00
Alexandre Flament
3700094f3a
Merge pull request #557 from return42/fix-autocomplete 
[fix] route /autocompleter: escape `<` and `>` in the simple theme
 2021-11-29 16:58:15 +01:00
Markus Heiser
fd8982d53d
Merge pull request #560 from return42/fix-page-title 
[fix] query_in_title: add missing space in title
 2021-11-29 14:55:32 +01:00
Markus Heiser
e12debe9ee [brand] README: add SearXNG logo 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 13:51:18 +01:00
Markus Heiser
1f896ea509 [fix] query_in_title: add missing space in title 
Suggested-by: @unixfox https://github.com/searxng/searxng/pull/485#issuecomment-981406978
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 11:08:21 +01:00
Markus Heiser
0c8ff97d9e [fix] route /autocompleter: escape < and > in the simple theme 
This is a follow up of 9a3253fc escaping `<` and `>` in all themes.  This patch
fix issue in oscar theme

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-29 07:20:08 +01:00
Markus Heiser
d0e21a01b4
Merge pull request #541 from dalf/simple-theme-svg2png 
Simple theme svg2png
 2021-11-28 20:13:53 +01:00
Markus Heiser
8154dd2a2e [build] /static 2021-11-28 20:07:49 +01:00
Alexandre Flament
59f4c792b4 [mod] simple theme: use sharp instead of convert to create .png from .svg 
define a custom grunt task, since grunt-sharp is too old (it can't be installed).
in gruntfile.js, the image tasks are moved at the end the build chain.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-28 20:05:37 +01:00
Markus Heiser
8c4c4259d4 [mod] gruntfile: do some polish (no functional change) 
- remove unused 'path' constant
- fix indentation
- Put all image tasks at the end, where it is easy to list which image is processed.

Suggested -by: @dalf https://github.com/searxng/searxng/pull/541#discussion_r756247157
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-28 20:04:10 +01:00
Markus Heiser
11ba7f294f
Merge pull request #554 from return42/fix-google-video 
[fix] google-videos engine: ignore news articles
 2021-11-27 12:59:39 +01:00
Markus Heiser
f0db33e14b
Merge pull request #555 from return42/fix-autocomplete 
[fix] route /autocompleter: escape '<' and '>' in the response
 2021-11-27 09:24:58 +01:00
Markus Heiser
9a3253fc16 [fix] route /autocompleter: escape '<' and '>' in the response 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-27 08:39:48 +01:00
Markus Heiser
e27b1ac57a
Merge pull request #549 from searxng/dependabot/pip/master/pylint-2.12.1 
Bump pylint from 2.11.1 to 2.12.1
 2021-11-27 00:40:26 +01:00
dependabot[bot]
8bde693189
Bump pylint from 2.11.1 to 2.12.1 
Bumps [pylint](https://github.com/PyCQA/pylint) from 2.11.1 to 2.12.1.
- [Release notes](https://github.com/PyCQA/pylint/releases)
- [Changelog](https://github.com/PyCQA/pylint/blob/main/ChangeLog)
- [Commits](https://github.com/PyCQA/pylint/compare/v2.11.1...v2.12.1)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-26 23:36:06 +00:00
Markus Heiser
96cb7123bb
Merge pull request #553 from return42/fix-oscar 
[fix] oscar theme: use SearXNG logo and wordmark
 2021-11-27 00:34:22 +01:00
Markus Heiser
27c1b9f660
Merge pull request #551 from dalf/fix-results-lock 
[fix] searx.results: fix pylint issue "useless-with-lock"
 2021-11-27 00:28:22 +01:00
Markus Heiser
ab5097d708
Merge pull request #545 from return42/fix-523 
[fix] simple-theme templates: polish HTML <img> elements
 2021-11-27 00:26:19 +01:00
mrpaulblack
c443e56458 [build] /static 2021-11-26 20:52:27 +01:00
mrpaulblack
0bb4d6b296 [oscar theme] center search on index and use logo with ponthi 2021-11-26 20:52:07 +01:00
Markus Heiser
6e06618e0c [fix] google-videos engine: ignore news articles 
In the video search, google also sometimes includes news.  E.g. in the DE
language when you search for `!gov paris`, google adds an article from a german
newspaper (FAZ), I assume these are sponsored link (not tagged advertisement?)

Those links do not have an image / this patch ignores *video links* wqithout an
image ID.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 17:11:20 +01:00
Markus Heiser
e54a06bae7 [fix] oscar theme: use SearXNG logo and wordmark 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 16:43:18 +01:00
Markus Heiser
cfb5eda4d1
Merge pull request #552 from return42/fix-searx.sh 
[fix] searx.sh update: replace git pull by a hard reset
 2021-11-26 15:41:52 +01:00
Markus Heiser
ee8b6aac36 [fix] searx.sh update: replace git pull by a hard reset 
If the fetched branch has been rebased a 'git pull' will fails.  To get fetched
branch in the working tree, a git reset is needed.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 15:15:17 +01:00
Alexandre Flament
0d41f26a20 [fix] searx.results: fix pylint issue "useless-with-lock" 
Replace "with threading.Lock():" by "with self._lock"
 2021-11-26 08:46:43 +01:00
Alexandre Flament
da1d502cf7
Merge pull request #550 from searxng/translations_update 
Update translations
 2021-11-26 08:26:51 +01:00
Alexandre Flament
328473befd
Merge pull request #547 from return42/fix-442 
[fix] google & google video engines
 2021-11-26 08:25:38 +01:00
searxng-bot
7b737e33e4 [translations] update 
647aee3b - 2021-11-25 - Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 07:18:23 +00:00
Markus Heiser
1ce09df9aa [fix] google video engine - rework of the HTML parser 
The google video response has been changed slightly, a rework of the parser was
needed.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-26 01:14:17 +01:00
Markus Heiser
488ace1da9 [fix] google engine - suggestion 
BTW: google no longer offers *spelling suggestions*

Closes: https://github.com/searxng/searxng/issues/442
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-25 19:42:03 +01:00
Markus Heiser
8fbffb1409 [fix] simple-theme templates: polish HTML <img> elements 
- <img> [1] element does not have an end tag, no need for a leading `/>`
- add global attribute title[2] to result_templates/images.html (result-images-source)
- in jinja macro 'macro result_header' remove duplicate of class="image"
- in jinja macro 'macro result_header' remove alt attribute (fix [3])::

    alt="{{ result.title|striptags }}"

  the result.title is already shown in::

    <h3>{{ result_link(result.url, result.title|safe) }}</h3>

[1] https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
[2] https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes#attr-title
[3] https://github.com/searxng/searxng/issues/523

Closes: https://github.com/searxng/searxng/issues/523
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-25 12:07:57 +01:00
Markus Heiser
bd285de48a
Merge pull request #543 from return42/fix-485 
[fix] templates: remove unneeded escape \' of single quotation mark
 2021-11-24 20:20:26 +01:00
Markus Heiser
3f3097c772 [fix] templates: remove unneeded escape \' of single quotation mark 
Strings like::

    'Query in the page\'s title'

are hard to read / remove escape sequence by using double quotation marks for
strings ::

    "Query in the page's title"

BTW: remove a leading dot in the simple theme [1].

[1] 80fb77476f (r756112716)

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2021-11-24 17:40:03 +01:00
Alexandre Flament
42c1a938f0
Merge pull request #485 from dalf/pref_query_in_title 
[mod] new preference: query_in_title
 2021-11-24 13:10:27 +01:00
Markus Heiser
dae165eaa0
Merge pull request #537 from return42/moz-warnings 
[simple theme] remove '-moz-border-radius' property
 2021-11-23 20:25:17 +01:00