Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 6d39c06f authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

test searxng updates

parent 6e702afa
Loading
Loading
Loading
Loading
+17 −43
Original line number Original line Diff line number Diff line
Searx was created by Adam Tauber and is maintained by Adam Tauber, Noémi Ványi, @pofilo, Gaspard d'Hautefeuille and Émilien Devos.
searxng is a fork from `searx <https://github.com/searx/searx>`_ and is
maintained by Alexandre Flament (`@dalf <https://github.com/dalf>`_) and Markus
Heiser (`@return42 <https://github.com/return42>`_)


Major contributing authors:
People who have submitted patches/translations, reported bugs, consulted
features or generally made searx better:


- Adam Tauber <asciimoo@gmail.com> `@asciimoo <https://github.com/asciimoo>`_
- Adam Tauber `@asciimoo <https://github.com/asciimoo>`_
- Matej Cotman
- Matej Cotman `@matejc <https://github.com/matejc>`_
- Thomas Pointhuber
- Émilien Devos `@unixfox <https://github.com/unixfox>`_
- Alexandre Flament `@dalf <https://github.com/dalf>`_
- Thomas Pointhuber `pointhi <https://github.com/pointhi>`_
- @Cqoicebordel
- Noémi Ványi `@kvch <https://github.com/kvch>`_
- Noémi Ványi
- `@Cqoicebordel <https://github.com/Cqoicebordel>`_
- Marc Abonce Seguin @a01200356
- Marc Abonce Seguin `@MarcAbonce <https://github.com/MarcAbonce>`_
- @pofilo
- `@pofilo <https://github.com/pofilo>`_
- Markus Heiser @return42
- Émilien Devos @unixfox
- Alexandre Flament

People who have submitted patches/translations, reported bugs, consulted features or
generally made searx better:


- Laszlo Hammerl
- Laszlo Hammerl
- Stefan Marsiske
- Stefan Marsiske
@@ -166,30 +163,7 @@ generally made searx better:
- @xenrox
- @xenrox
- @OliveiraHermogenes
- @OliveiraHermogenes
- Paul Alcock @Guilvareux
- Paul Alcock @Guilvareux
- Ben Collerson
- Sam A. `<https://samsapti.dev>`_
- @3nprob
- @XavierHorwood
- @plague-doctor
- Ahmad Alkadri `<https://github.com/ahmad-alkadri>`_
- @CicadaCinema
- Milad Laly @Milad-Laly
- @mikamp116
 No newline at end of file
- @Zackptg5
- @darkmagic13
- @CrocodileCroco
- @allendema
- Jordan Webb @jordemort
- Samuel Dudik @dudik
- @c1492
- @nav1s
- Igor Rzegocki @ajgon
- Dmitrii Faiazov @scientia-ac-labore
- @noctux
- @jecarr
- @israelyago
- Georg @tacerus
- Dario Nuevo @narcoticfresh
- Andy Jones @andyljones
- Maciej Urbański @rooterkyberian
- @ilyakooo0
- Eric Zhang @EricZhang456
- @nathannaveen
- @liimee
- @james-still
+6 −107
Original line number Original line Diff line number Diff line
1.1.0 2022.08.07
================

It has been a while since we released a new version of searx. Thus, we have lots of new things to offer, like new engines, autocompleter, plugins, etc. We got numerous contributions from ~30 new developers, but also we got many PRs from our recurring contributors.

Thank you so much for you support! We couldn't have release so many awesome things without you!

Core
~~~~

- Drop Python 3.6 support #3133
- Run tests under python 3.10 #3035
- Reduce redundant docker build steps #2725
- Allow overriding Docker repository when building docker image #2726
- Add healthcheck endpoint for Docker #2992

New engines
~~~~~~~~~~~

- Wordnik.com #2735
- Bandcamp #2763
- SJP - Słownik języka polskiego #2736
- Wikimini #2819
- Dogpile #2822
- PyPI XPATH engine #2830
- ManKier #2829
- Kaufland.de #2915
- ask.com #2898
- gpodder.net (JSON) #2885
- woxikon.de synonyme (xpath) #2883
- Petalsearch.com engine (xpath) #2897
- whaleslide.com #2861
- azlyrics.com #2955
- IMDB #2980
- Prowlarr #3118
- Tineye reverse image search #3040
- Onesearch #3065
- TVmaze #3246
- Emojipedia #3278
- Psychonautwiki by @dimethyltriptamine @kvch

Fixed engines
~~~~~~~~~~~~~

- Remove hubsbpot tracking URL params #2723
- Fix URL to solidtorrent result page #2786
- Update onion engines to v3 #2904
- Fix Seznam engine #2905
- Add pagination support for Library Genesis #2887
- Fix uppercase ip query #2991
- Fix Libgen + Uncomment Ebay and Urbandictionary #2986
- Fixed Hoogle engine #3146
- Fix Digg engine #3150
- Don't lump all search suggestions together in Yahoo #3208
- Fix DDG safe search #3247
- Fix Qwant: Remove extra q from URL #3091

New plugins
~~~~~~~~~~~

- hostname_replace plugin to rewrite result hostnames #2724
- search_operators plugin to filter search results using -, site: and -site: #3311

Fixed plugins
~~~~~~~~~~~~~

- Fix default_doi_resolver in preferences #2707
- Add DOI resolver from sci-hub and replace default DOI #2706

Themes
~~~~~~

- Fix dark "expand" button from infobox #2702
- fix url_for(..., _external=True) in templates #2656
- [enh] oscar: image thumbnail layout #2675
- Improve text overflow of custom select #2985
- Products results: add possibility to show if a product is in stock or not #3120
- Configurable autofocus of search input (#1984) #3285
- archive.today option for results page #3308
- Fix keyboard hints for category tabs (#1187) #3276

Enhancements
~~~~~~~~~~~~

- Allow overriding env vars SEARX_SETTINGS_PATH, UWSGI_SETTINGS_PATH #2717
- correct typo/grammatical mistake #2744
- Fix bug for 'FileNotFoundError' in 'standalone_searx.py' #2764
- Fix grammar mistake in debug log output #2759
- Fix typo #2768
- Fix redirect when saving preferences #2760
- Replace Makefile boilerplate by shell scripts #2594
- Fix Qwant's fetch_languages function #2799
- Apply HTTPS where possible + fix small typo #2922
- Сhange in user-agent Firefox versions to latest #3008
- Use engine-type when looking up supported_languages from JSON files #3002
- Update about section of Invidious and Rumble + Change filtron error wording #2959
- Verify that Tor proxy works every time searx starts #3015
- Update settings_loader.get_user_settings_path() #3056
- Fix wrong func call #3058
- Improve ranking based on language #3053

1.0.0 2021.03.27
1.0.0 2021.03.27
================
================


@@ -281,7 +180,7 @@ New settings.yml
- ``ui.advanced_search`` - add preference for displaying advanced settings ( #2327 )
- ``ui.advanced_search`` - add preference for displaying advanced settings ( #2327 )
- ``server.method: "POST"`` - Make default query submission method configurable ( #2130 )
- ``server.method: "POST"`` - Make default query submission method configurable ( #2130 )
- ``server.default_http_headers`` - add default http headers ( #2295 )
- ``server.default_http_headers`` - add default http headers ( #2295 )
- ``engines.*.proxies`` - Using proxy only for specific engines ( #1827 #2319 ), see https://searx.github.io/searx/dev/engine_overview.html#settings-yml
- ``engines.*.proxies`` - Using proxy only for specific engines ( #1827 #2319 ), see https://docs.searxng.org/dev/engine_overview.html#settings-yml
- ``enabled_plugins`` - Enabled plugins ( a05c660e3036ad8d02072fc6731af54c2ed6151c )
- ``enabled_plugins`` - Enabled plugins ( a05c660e3036ad8d02072fc6731af54c2ed6151c )
- ``preferences.lock`` - Let admins lock user preferences ( #2270 )
- ``preferences.lock`` - Let admins lock user preferences ( #2270 )


@@ -397,8 +296,8 @@ Special thanks to `NLNet <https://nlnet.nl>`__ for sponsoring multiple features
   - Wikivoyage
   - Wikivoyage
   - Rubygems
   - Rubygems
 - Engine fixes (google, google images, startpage, gigablast, yacy)
 - Engine fixes (google, google images, startpage, gigablast, yacy)
 - Private engines introduced - more details: https://searx.github.io/searx/blog/private-engines.html
 - Private engines introduced - more details: https://docs.searxng.org/blog/private-engines.html
 - Greatly improved documentation - check it at https://searx.github.io/searx
 - Greatly improved documentation - check it at https://docs.searxng.org
 - Added autofocus to all search inputs
 - Added autofocus to all search inputs
 - CSP friendly oscar theme
 - CSP friendly oscar theme
 - Added option to hide engine errors with `display_error_messages` engine option (true/false values, default is true)
 - Added option to hide engine errors with `display_error_messages` engine option (true/false values, default is true)
@@ -424,7 +323,7 @@ Special thanks to `NLNet <https://nlnet.nl>`__ for sponsoring multiple features
 - Removed engines: faroo
 - Removed engines: faroo


Special thanks to `NLNet <https://nlnet.nl>`__ for sponsoring multiple features of this release.
Special thanks to `NLNet <https://nlnet.nl>`__ for sponsoring multiple features of this release.
Special thanks to https://www.accessibility.nl/english for making accessibilty audit.
Special thanks to https://www.accessibility.nl/english for making accessibility audit.


News
News
~~~~
~~~~
@@ -461,7 +360,7 @@ News
- Docker image updates
- Docker image updates
- Bang expression fixes
- Bang expression fixes
- Result merging fixes
- Result merging fixes
- New environment variable added: SEARX_BIND_ADDRESS
- New environment variable added: SEARXNG_BIND_ADDRESS




News
News
@@ -696,7 +595,7 @@ News
News
News
~~~~
~~~~


New documentation page is available: https://searx.github.io/searx
New documentation page is available: https://docs.searxng.org




0.8.0 2015.09.08
0.8.0 2015.09.08
+2 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,8 @@


## Resources in the documentation
## Resources in the documentation


* [Development quickstart](https://searx.github.io/searx/dev/contribution_guide.html)
* [Development quickstart](https://docs.searxng.org/dev/contribution_guide.html)
* [Contribution guide](https://searx.github.io/searx/dev/contribution_guide.html)
* [Contribution guide](https://docs.searxng.org/dev/contribution_guide.html)


## Submitting PRs
## Submitting PRs


+81 −13
Original line number Original line Diff line number Diff line
FROM base-env-image as builder
FROM alpine:3.17
# base-env-image -> ${CI_REGISTRY_IMAGE}/env
ENTRYPOINT ["/sbin/tini","--","/usr/local/searxng/dockerfiles/docker-entrypoint.sh"]
EXPOSE 8080
VOLUME /etc/searxng


COPY . /src/
ARG SEARXNG_GID=977
RUN pip install --force-reinstall --prefix /install /src
ARG SEARXNG_UID=977


FROM python:3.9-slim
RUN addgroup -g ${SEARXNG_GID} searxng && \
LABEL maintainer="dev@e.email"
    adduser -u ${SEARXNG_UID} -D -h /usr/local/searxng -s /bin/sh -G searxng searxng
LABEL description="A privacy-respecting, hackable metasearch engine."


RUN apt-get update -y && apt-get install -y libxslt1.1
ENV INSTANCE_NAME=searxng \
RUN pip install gunicorn==20.0.4
    AUTOCOMPLETE= \
    BASE_URL= \
    MORTY_KEY= \
    MORTY_URL= \
    SEARXNG_SETTINGS_PATH=/etc/searxng/settings.yml \
    UWSGI_SETTINGS_PATH=/etc/searxng/uwsgi.ini


COPY --from=builder /install/ /usr/local/
WORKDIR /usr/local/searxng


EXPOSE 80
COPY requirements.txt ./requirements.txt
STOPSIGNAL SIGINT


CMD ["gunicorn", "-w", "4", "--threads", "4", "-b", "0.0.0.0:80", "--pythonpath", "/usr/local/lib/python3.9/site-packages", "searx.webapp:app"]
RUN apk add --no-cache -t build-dependencies \
    build-base \
    py3-setuptools \
    python3-dev \
    libffi-dev \
    libxslt-dev \
    libxml2-dev \
    openssl-dev \
    tar \
    git \
 && apk add --no-cache \
    ca-certificates \
    su-exec \
    python3 \
    py3-pip \
    libxml2 \
    libxslt \
    openssl \
    tini \
    uwsgi \
    uwsgi-python3 \
    brotli \
 && pip3 install --no-cache -r requirements.txt \
 && apk del build-dependencies \
 && rm -rf /root/.cache

COPY --chown=searxng:searxng dockerfiles ./dockerfiles
COPY --chown=searxng:searxng searx ./searx

ARG TIMESTAMP_SETTINGS=0
ARG TIMESTAMP_UWSGI=0
ARG VERSION_GITCOMMIT=unknown

RUN su searxng -c "/usr/bin/python3 -m compileall -q searx" \
 && touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml \
 && touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini \
 && find /usr/local/searxng/searx/static -a \( -name '*.html' -o -name '*.css' -o -name '*.js' \
    -o -name '*.svg' -o -name '*.ttf' -o -name '*.eot' \) \
    -type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+

# Keep these arguments at the end to prevent redundant layer rebuilds
ARG LABEL_DATE=
ARG GIT_URL=unknown
ARG SEARXNG_GIT_VERSION=unknown
ARG LABEL_VCS_REF=
ARG LABEL_VCS_URL=
LABEL maintainer="searxng <${GIT_URL}>" \
      description="A privacy-respecting, hackable metasearch engine." \
      version="${SEARXNG_GIT_VERSION}" \
      org.label-schema.schema-version="1.0" \
      org.label-schema.name="searxng" \
      org.label-schema.version="${SEARXNG_GIT_VERSION}" \
      org.label-schema.url="${LABEL_VCS_URL}" \
      org.label-schema.vcs-ref=${LABEL_VCS_REF} \
      org.label-schema.vcs-url=${LABEL_VCS_URL} \
      org.label-schema.build-date="${LABEL_DATE}" \
      org.label-schema.usage="https://github.com/searxng/searxng-docker" \
      org.opencontainers.image.title="searxng" \
      org.opencontainers.image.version="${SEARXNG_GIT_VERSION}" \
      org.opencontainers.image.url="${LABEL_VCS_URL}" \
      org.opencontainers.image.revision=${LABEL_VCS_REF} \
      org.opencontainers.image.source=${LABEL_VCS_URL} \
      org.opencontainers.image.created="${LABEL_DATE}" \
      org.opencontainers.image.documentation="https://github.com/searxng/searxng-docker"
+35 −38
Original line number Original line Diff line number Diff line
@@ -14,35 +14,34 @@ help:
	@./manage --help
	@./manage --help
	@echo '----'
	@echo '----'
	@echo 'run            - run developer instance'
	@echo 'run            - run developer instance'
	@echo 'install        - developer install of searx into virtualenv'
	@echo 'install        - developer install of SearxNG into virtualenv'
	@echo 'uninstall      - uninstall developer installation'
	@echo 'uninstall      - uninstall developer installation'
	@echo 'clean          - clean up working tree'
	@echo 'clean          - clean up working tree'
	@echo 'search.checker - check search engines'
	@echo 'search.checker - check search engines'
	@echo 'test           - run shell & CI tests'
	@echo 'test           - run shell & CI tests'
	@echo 'test.sh        - test shell scripts'
	@echo 'test.shell     - test shell scripts'
	@echo 'ci.test        - run CI tests'
	@echo 'ci.test        - run CI tests'




PHONY += run
PHONY += run
run:  install
run:  install
	$(Q) ( \
	$(Q)./manage webapp.run
	sleep 2 ; \
	xdg-open http://127.0.0.1:8888/ ; \
	) &
	SEARX_DEBUG=1 ./manage pyenv.cmd python ./searx/webapp.py


PHONY += install uninstall
PHONY += install uninstall
install uninstall:
install uninstall:
	$(Q)./manage pyenv.$@
	$(Q)./manage pyenv.$@


PHONY += clean
PHONY += clean
clean: py.clean docs.clean node.clean test.clean
clean: py.clean docs.clean node.clean nvm.clean test.clean
	$(Q)./manage build_msg CLEAN  "common files"
	$(Q)./manage build_msg CLEAN  "common files"
	$(Q)find . -name '*.orig' -exec rm -f {} +
	$(Q)find . -name '*.orig' -exec rm -f {} +
	$(Q)find . -name '*.rej' -exec rm -f {} +
	$(Q)find . -name '*.rej' -exec rm -f {} +
	$(Q)find . -name '*~' -exec rm -f {} +
	$(Q)find . -name '*~' -exec rm -f {} +
	$(Q)find . -name '*.bak' -exec rm -f {} +
	$(Q)find . -name '*.bak' -exec rm -f {} +


lxc.clean:
	$(Q)rm -rf lxc-env

PHONY += search.checker search.checker.%
PHONY += search.checker search.checker.%
search.checker: install
search.checker: install
	$(Q)./manage pyenv.cmd searx-checker -v
	$(Q)./manage pyenv.cmd searx-checker -v
@@ -50,58 +49,56 @@ search.checker: install
search.checker.%: install
search.checker.%: install
	$(Q)./manage pyenv.cmd searx-checker -v "$(subst _, ,$(patsubst search.checker.%,%,$@))"
	$(Q)./manage pyenv.cmd searx-checker -v "$(subst _, ,$(patsubst search.checker.%,%,$@))"


PHONY += ci.test test test.sh
PHONY += test ci.test test.shell
ci.test: test.pep8 test.pylint test.unit test.robot
ci.test: test.yamllint test.black test.pyright test.pylint test.unit test.robot test.rst test.pybabel
test: ci.test
test:    test.yamllint test.black test.pyright test.pylint test.unit test.robot test.rst test.shell
test.sh:
test.shell:
	$(Q)shellcheck -x -s dash \
		dockerfiles/docker-entrypoint.sh
	$(Q)shellcheck -x -s bash \
	$(Q)shellcheck -x -s bash \
		utils/brand.env \
		utils/brand.env \
		./manage \
		$(MTOOLS) \
		utils/lib.sh \
		utils/lib.sh \
		utils/lib_nvm.sh \
		utils/lib_static.sh \
		utils/lib_go.sh \
		utils/lib_redis.sh \
		utils/filtron.sh \
		utils/filtron.sh \
		utils/searx.sh \
		utils/searx.sh \
		utils/searxng.sh \
		utils/morty.sh \
		utils/morty.sh \
		utils/lxc.sh \
		utils/lxc.sh \
	        utils/lxc-searx.env \
		utils/lxc-searxng.env
	        .config.sh
	$(Q)$(MTOOLS) build_msg TEST "$@ OK"
	$(Q)./manage build_msg TEST "$@ OK"




# wrap ./manage script
# wrap ./manage script


MANAGE += buildenv
MANAGE += buildenv
MANAGE += babel.compile
MANAGE += weblate.translations.commit weblate.push.translations
MANAGE += data.all data.languages data.useragents
MANAGE += data.all data.languages data.useragents data.osm_keys_tags
MANAGE += docs.html docs.live docs.gh-pages docs.prebuild docs.clean
MANAGE += docs.html docs.live docs.gh-pages docs.prebuild docs.clean
MANAGE += docker.build docker.push
MANAGE += docker.build docker.push docker.buildx
MANAGE += gecko.driver
MANAGE += gecko.driver
MANAGE += node.env node.clean
MANAGE += node.env node.clean
MANAGE += py.build py.clean
MANAGE += py.build py.clean
MANAGE += pyenv pyenv.install pyenv.uninstall
MANAGE += pyenv pyenv.install pyenv.uninstall
MANAGE += pypi.upload pypi.upload.test
MANAGE += pypi.upload pypi.upload.test
MANAGE += test.pylint test.pep8 test.unit test.coverage test.robot test.clean
MANAGE += format.python
MANAGE += themes.all themes.oscar themes.simple themes.bootstrap
MANAGE += test.yamllint test.pylint test.pyright test.black test.pybabel test.unit test.coverage test.robot test.rst test.clean
MANAGE += themes.all themes.simple themes.simple.test pygments.less
MANAGE += static.build.commit static.build.drop static.build.restore
MANAGE += nvm.install nvm.clean nvm.status nvm.nodejs


PHONY += $(MANAGE)
PHONY += $(MANAGE)


$(MANAGE):
$(MANAGE):
	$(Q)$(MTOOLS) $@
	$(Q)$(MTOOLS) $@


# deprecated
# short hands of selected targets


PHONY += docs docs-clean docs-live docker themes
PHONY += docs docker themes


docs: docs.html
docs: docs.html
	$(Q)./manage build_msg WARN $@ is deprecated use docs.html

docs-clean: docs.clean
	$(Q)./manage build_msg WARN $@ is deprecated use docs.clean

docs-live: docs.live
	$(Q)./manage build_msg WARN $@ is deprecated use docs.live

docker:  docker.build
docker:  docker.build
	$(Q)./manage build_msg WARN $@ is deprecated use docker.build

themes: themes.all
themes: themes.all
	$(Q)./manage build_msg WARN $@ is deprecated use themes.all
Loading