mirror of
https://github.com/searxng/searxng.git
synced 2026-08-15 19:51:23 +00:00
Compare commits
1 Commits
revert-649
...
6f2d399777
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f2d399777 |
39
.github/scripts/ai_policy.cjs
vendored
39
.github/scripts/ai_policy.cjs
vendored
@@ -1,39 +0,0 @@
|
|||||||
// Closes issues and prs whose authors/agents don't accept the ai policy
|
|
||||||
// https://github.com/searxng/searxng/blob/master/AI_POLICY.rst
|
|
||||||
|
|
||||||
module.exports = async ({ github, context }) => {
|
|
||||||
const item = context.payload.pull_request || context.payload.issue;
|
|
||||||
const body = item.body || '';
|
|
||||||
const kind = context.payload.pull_request ? 'pull request' : 'issue';
|
|
||||||
|
|
||||||
// https://github.com/searxng/searxng/pull/6476#discussion_r3683782481
|
|
||||||
const hasBox = /\[[Xx]\].*AI Policy/.test(body);
|
|
||||||
const hasRef = /\[AI Policy\]:\s*https:\/\/github\.com\/searxng\/searxng\/.*AI_POLICY/.test(body);
|
|
||||||
if (hasBox && hasRef) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const { owner, repo } = context.repo;
|
|
||||||
await github.rest.issues.createComment({
|
|
||||||
owner,
|
|
||||||
repo,
|
|
||||||
issue_number: item.number,
|
|
||||||
body:
|
|
||||||
'Hello! Thank you for your contribution.\n\n' +
|
|
||||||
`Unfortunately your ${kind} was closed as the AI Policy has not been accepted.\n\n` +
|
|
||||||
`Please open a new ${kind} after confirming your contribution aligns with our AI Policy.`,
|
|
||||||
});
|
|
||||||
await github.rest.issues.addLabels({
|
|
||||||
owner,
|
|
||||||
repo,
|
|
||||||
issue_number: item.number,
|
|
||||||
labels: ['invalid:slop'],
|
|
||||||
});
|
|
||||||
await github.rest.issues.update({
|
|
||||||
owner,
|
|
||||||
repo,
|
|
||||||
issue_number: item.number,
|
|
||||||
state: 'closed',
|
|
||||||
state_reason: 'not_planned',
|
|
||||||
});
|
|
||||||
};
|
|
||||||
38
.github/workflows/ai-policy.yml
vendored
38
.github/workflows/ai-policy.yml
vendored
@@ -1,38 +0,0 @@
|
|||||||
---
|
|
||||||
# yamllint disable rule:line-length
|
|
||||||
name: AI Policy
|
|
||||||
|
|
||||||
# Closes any new issues and PRs from people (or agents) who don't accept the AI Policy
|
|
||||||
|
|
||||||
# yamllint disable-line rule:truthy
|
|
||||||
on:
|
|
||||||
issues:
|
|
||||||
types: [opened]
|
|
||||||
pull_request_target:
|
|
||||||
types: [opened]
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
check:
|
|
||||||
name: Check AI Policy
|
|
||||||
# for issues with an author who has not contributed before
|
|
||||||
if: >-
|
|
||||||
github.event.sender.type != 'Bot' &&
|
|
||||||
contains(fromJSON('["NONE","FIRST_TIMER","FIRST_TIME_CONTRIBUTOR"]'),
|
|
||||||
github.event.issue.author_association ||
|
|
||||||
github.event.pull_request.author_association)
|
|
||||||
runs-on: ubuntu-26.04-arm
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
|
||||||
with:
|
|
||||||
persist-credentials: "false"
|
|
||||||
|
|
||||||
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
|
||||||
with:
|
|
||||||
script: |
|
|
||||||
const script = require('./.github/scripts/ai_policy.cjs');
|
|
||||||
await script({ github, context });
|
|
||||||
154
.github/workflows/container.yml
vendored
154
.github/workflows/container.yml
vendored
@@ -25,21 +25,25 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
if: |
|
if: github.repository_owner == 'searxng' || github.event_name == 'workflow_dispatch'
|
||||||
github.event_name == 'workflow_dispatch'
|
|
||||||
|| (github.repository_owner == 'searxng' && github.event.workflow_run.conclusion == 'success')
|
|
||||||
name: Build (${{ matrix.arch }})
|
name: Build (${{ matrix.arch }})
|
||||||
runs-on: ${{ matrix.runner }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- runner: ubuntu-26.04
|
- arch: amd64
|
||||||
arch: amd64
|
march: amd64
|
||||||
- runner: ubuntu-26.04-arm
|
os: ubuntu-24.04
|
||||||
arch: arm64
|
emulation: false
|
||||||
- runner: ubuntu-26.04-arm
|
- arch: arm64
|
||||||
arch: armv7
|
march: arm64
|
||||||
|
os: ubuntu-24.04-arm
|
||||||
|
emulation: false
|
||||||
|
- arch: armv7
|
||||||
|
march: arm64
|
||||||
|
os: ubuntu-24.04-arm
|
||||||
|
emulation: true
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
packages: write
|
packages: write
|
||||||
@@ -49,82 +53,109 @@ jobs:
|
|||||||
git_url: ${{ steps.build.outputs.git_url }}
|
git_url: ${{ steps.build.outputs.git_url }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Login to GHCR
|
# yamllint disable rule:line-length
|
||||||
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
- name: Setup podman
|
||||||
with:
|
env:
|
||||||
registry: "ghcr.io"
|
PODMAN_VERSION: "v5.7.1"
|
||||||
username: "${{ github.repository_owner }}"
|
run: |
|
||||||
password: "${{ secrets.GITHUB_TOKEN }}"
|
sudo apt-get purge -y podman runc crun conmon
|
||||||
|
|
||||||
|
curl -fsSLO "https://github.com/mgoltzsche/podman-static/releases/download/${{ env.PODMAN_VERSION }}/podman-linux-${{ matrix.march }}.tar.gz"
|
||||||
|
curl -fsSLO "https://github.com/mgoltzsche/podman-static/releases/download/${{ env.PODMAN_VERSION }}/podman-linux-${{ matrix.march }}.tar.gz.asc"
|
||||||
|
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 0CCF102C4F95D89E583FF1D4F8B5AF50344BB503
|
||||||
|
gpg --batch --verify "podman-linux-${{ matrix.march }}.tar.gz.asc" "podman-linux-${{ matrix.march }}.tar.gz"
|
||||||
|
|
||||||
|
tar -xzf "podman-linux-${{ matrix.march }}.tar.gz"
|
||||||
|
sudo cp -rfv ./podman-linux-${{ matrix.march }}/etc/. /etc/
|
||||||
|
sudo cp -rfv ./podman-linux-${{ matrix.march }}/usr/. /usr/
|
||||||
|
|
||||||
|
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
|
||||||
|
# yamllint enable rule:line-length
|
||||||
|
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
|
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
|
||||||
with:
|
with:
|
||||||
python-version: "${{ env.PYTHON_VERSION }}"
|
python-version: "${{ env.PYTHON_VERSION }}"
|
||||||
|
|
||||||
- name: Setup QEMU
|
|
||||||
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
ref: "${{ github.event.workflow_run.head_sha || github.sha }}"
|
|
||||||
persist-credentials: "false"
|
persist-credentials: "false"
|
||||||
fetch-depth: "0"
|
fetch-depth: "0"
|
||||||
|
|
||||||
- name: Setup cache Python
|
- name: Setup cache Python
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
with:
|
with:
|
||||||
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-
|
python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-
|
||||||
path: "./local/"
|
path: "./local/"
|
||||||
|
|
||||||
|
- name: Get date
|
||||||
|
id: date
|
||||||
|
run: echo "date=$(date +'%Y%m%d')" >>$GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Setup cache container
|
- name: Setup cache container
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
with:
|
with:
|
||||||
key: "container-${{ matrix.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
key: "container-${{ matrix.arch }}-${{ steps.date.outputs.date }}-${{ hashFiles('./requirements*.txt') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
|
container-${{ matrix.arch }}-${{ steps.date.outputs.date }}-
|
||||||
container-${{ matrix.arch }}-
|
container-${{ matrix.arch }}-
|
||||||
path: "/var/tmp/buildah-cache-*/*"
|
path: "/var/tmp/buildah-cache-*/*"
|
||||||
|
|
||||||
- name: Build
|
- if: ${{ matrix.emulation }}
|
||||||
id: build
|
name: Setup QEMU
|
||||||
env:
|
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
|
||||||
OVERRIDE_ARCH: "${{ matrix.arch }}"
|
|
||||||
run: make container.build
|
|
||||||
|
|
||||||
test:
|
|
||||||
name: Test (${{ matrix.arch }})
|
|
||||||
runs-on: ${{ matrix.runner }}
|
|
||||||
needs: build
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- runner: ubuntu-26.04
|
|
||||||
arch: amd64
|
|
||||||
- runner: ubuntu-26.04-arm
|
|
||||||
arch: arm64
|
|
||||||
- runner: ubuntu-26.04-arm
|
|
||||||
arch: armv7
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Login to GHCR
|
- name: Login to GHCR
|
||||||
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
||||||
with:
|
with:
|
||||||
registry: "ghcr.io"
|
registry: "ghcr.io"
|
||||||
username: "${{ github.repository_owner }}"
|
username: "${{ github.repository_owner }}"
|
||||||
password: "${{ secrets.GITHUB_TOKEN }}"
|
password: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
|
||||||
- name: Setup QEMU
|
- name: Build
|
||||||
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
|
id: build
|
||||||
|
env:
|
||||||
|
OVERRIDE_ARCH: "${{ matrix.arch }}"
|
||||||
|
run: make podman.build
|
||||||
|
|
||||||
|
test:
|
||||||
|
name: Test (${{ matrix.arch }})
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
needs: build
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- arch: amd64
|
||||||
|
os: ubuntu-24.04
|
||||||
|
emulation: false
|
||||||
|
- arch: arm64
|
||||||
|
os: ubuntu-24.04-arm
|
||||||
|
emulation: false
|
||||||
|
- arch: armv7
|
||||||
|
os: ubuntu-24.04-arm
|
||||||
|
emulation: true
|
||||||
|
|
||||||
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
ref: "${{ github.event.workflow_run.head_sha || github.sha }}"
|
|
||||||
persist-credentials: "false"
|
persist-credentials: "false"
|
||||||
|
|
||||||
|
- if: ${{ matrix.emulation }}
|
||||||
|
name: Setup QEMU
|
||||||
|
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
|
||||||
|
|
||||||
|
- name: Login to GHCR
|
||||||
|
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
||||||
|
with:
|
||||||
|
registry: "ghcr.io"
|
||||||
|
username: "${{ github.repository_owner }}"
|
||||||
|
password: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
env:
|
env:
|
||||||
OVERRIDE_ARCH: "${{ matrix.arch }}"
|
OVERRIDE_ARCH: "${{ matrix.arch }}"
|
||||||
@@ -134,7 +165,7 @@ jobs:
|
|||||||
release:
|
release:
|
||||||
if: github.repository_owner == 'searxng' && github.ref_name == 'master'
|
if: github.repository_owner == 'searxng' && github.ref_name == 'master'
|
||||||
name: Release
|
name: Release
|
||||||
runs-on: ubuntu-26.04-arm
|
runs-on: ubuntu-24.04-arm
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
@@ -143,25 +174,24 @@ jobs:
|
|||||||
packages: write
|
packages: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Login to Docker Hub
|
- name: Checkout
|
||||||
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
registry: "docker.io"
|
persist-credentials: "false"
|
||||||
username: "${{ secrets.DOCKER_USER }}"
|
|
||||||
password: "${{ secrets.DOCKER_TOKEN }}"
|
|
||||||
|
|
||||||
- name: Login to GHCR
|
- name: Login to GHCR
|
||||||
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
|
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
||||||
with:
|
with:
|
||||||
registry: "ghcr.io"
|
registry: "ghcr.io"
|
||||||
username: "${{ github.repository_owner }}"
|
username: "${{ github.repository_owner }}"
|
||||||
password: "${{ secrets.GITHUB_TOKEN }}"
|
password: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Login to Docker Hub
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
|
||||||
with:
|
with:
|
||||||
ref: "${{ github.event.workflow_run.head_sha || github.sha }}"
|
registry: "docker.io"
|
||||||
persist-credentials: "false"
|
username: "${{ secrets.DOCKER_USER }}"
|
||||||
|
password: "${{ secrets.DOCKER_TOKEN }}"
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
env:
|
env:
|
||||||
|
|||||||
23
.github/workflows/data-update.yml
vendored
23
.github/workflows/data-update.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
|||||||
data:
|
data:
|
||||||
if: github.repository_owner == 'searxng'
|
if: github.repository_owner == 'searxng'
|
||||||
name: ${{ matrix.fetch }}
|
name: ${{ matrix.fetch }}
|
||||||
runs-on: ubuntu-26.04-arm
|
runs-on: ubuntu-24.04-arm
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -33,6 +33,7 @@ jobs:
|
|||||||
- update_engine_traits.py
|
- update_engine_traits.py
|
||||||
- update_wikidata_units.py
|
- update_wikidata_units.py
|
||||||
- update_engine_descriptions.py
|
- update_engine_descriptions.py
|
||||||
|
- update_gsa_useragents.py
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -40,17 +41,17 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
|
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
|
||||||
with:
|
with:
|
||||||
python-version: "${{ env.PYTHON_VERSION }}"
|
python-version: "${{ env.PYTHON_VERSION }}"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
persist-credentials: "false"
|
persist-credentials: "false"
|
||||||
|
|
||||||
- name: Setup cache Python
|
- name: Setup cache Python
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
with:
|
with:
|
||||||
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
@@ -64,17 +65,23 @@ jobs:
|
|||||||
run: V=1 ./manage pyenv.cmd python "./searxng_extra/update/${{ matrix.fetch }}"
|
run: V=1 ./manage pyenv.cmd python "./searxng_extra/update/${{ matrix.fetch }}"
|
||||||
|
|
||||||
- name: Create PR
|
- name: Create PR
|
||||||
|
id: cpr
|
||||||
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
|
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
|
||||||
with:
|
with:
|
||||||
author: "searxng-bot <searxng-bot@users.noreply.github.com>"
|
author: "searxng-bot <searxng-bot@users.noreply.github.com>"
|
||||||
committer: "searxng-bot <searxng-bot@users.noreply.github.com>"
|
committer: "searxng-bot <searxng-bot@users.noreply.github.com>"
|
||||||
title: "[mod] data: update searx.data - ${{ matrix.fetch }}"
|
title: "[data] update searx.data - ${{ matrix.fetch }}"
|
||||||
commit-message: "[mod] data: update searx.data - ${{ matrix.fetch }}"
|
commit-message: "[data] update searx.data - ${{ matrix.fetch }}"
|
||||||
branch: "ci-data-${{ matrix.fetch }}"
|
branch: "update_data_${{ matrix.fetch }}"
|
||||||
delete-branch: "true"
|
delete-branch: "true"
|
||||||
draft: "false"
|
draft: "false"
|
||||||
signoff: "false"
|
signoff: "false"
|
||||||
body: |
|
body: |
|
||||||
Update searx.data - ${{ matrix.fetch }}
|
[data] update searx.data - ${{ matrix.fetch }}
|
||||||
labels: |
|
labels: |
|
||||||
data
|
data
|
||||||
|
|
||||||
|
- name: Display information
|
||||||
|
run: |
|
||||||
|
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
||||||
|
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
||||||
|
|||||||
10
.github/workflows/documentation.yml
vendored
10
.github/workflows/documentation.yml
vendored
@@ -25,25 +25,25 @@ jobs:
|
|||||||
release:
|
release:
|
||||||
if: github.repository_owner == 'searxng' || github.event_name == 'workflow_dispatch'
|
if: github.repository_owner == 'searxng' || github.event_name == 'workflow_dispatch'
|
||||||
name: Release
|
name: Release
|
||||||
runs-on: ubuntu-26.04-arm
|
runs-on: ubuntu-24.04-arm
|
||||||
permissions:
|
permissions:
|
||||||
# for JamesIves/github-pages-deploy-action to push
|
# for JamesIves/github-pages-deploy-action to push
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
|
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
|
||||||
with:
|
with:
|
||||||
python-version: "${{ env.PYTHON_VERSION }}"
|
python-version: "${{ env.PYTHON_VERSION }}"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
persist-credentials: "false"
|
persist-credentials: "false"
|
||||||
fetch-depth: "0"
|
fetch-depth: "0"
|
||||||
|
|
||||||
- name: Setup cache Python
|
- name: Setup cache Python
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
with:
|
with:
|
||||||
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
@@ -65,7 +65,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
folder: "dist/docs"
|
folder: "dist/docs"
|
||||||
branch: "gh-pages"
|
branch: "gh-pages"
|
||||||
commit-message: "[mod] docs: build from commit ${{ github.sha }}"
|
commit-message: "[doc] build from commit ${{ github.sha }}"
|
||||||
# Automatically remove deleted files from the deploy branch
|
# Automatically remove deleted files from the deploy branch
|
||||||
clean: "true"
|
clean: "true"
|
||||||
single-commit: "true"
|
single-commit: "true"
|
||||||
|
|||||||
41
.github/workflows/integration.yml
vendored
41
.github/workflows/integration.yml
vendored
@@ -23,7 +23,7 @@ env:
|
|||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
name: Python ${{ matrix.python-version }}
|
name: Python ${{ matrix.python-version }}
|
||||||
runs-on: ubuntu-26.04
|
runs-on: ubuntu-24.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
python-version:
|
python-version:
|
||||||
@@ -34,17 +34,17 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
|
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
|
||||||
with:
|
with:
|
||||||
python-version: "${{ matrix.python-version }}"
|
python-version: "${{ matrix.python-version }}"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
persist-credentials: "false"
|
persist-credentials: "false"
|
||||||
|
|
||||||
- name: Setup cache Python
|
- name: Setup cache Python
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
with:
|
with:
|
||||||
key: "python-${{ matrix.python-version }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
key: "python-${{ matrix.python-version }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
@@ -59,40 +59,37 @@ jobs:
|
|||||||
|
|
||||||
theme:
|
theme:
|
||||||
name: Theme
|
name: Theme
|
||||||
runs-on: ubuntu-26.04-arm
|
runs-on: ubuntu-24.04-arm
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
|
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
|
||||||
with:
|
with:
|
||||||
python-version: "${{ env.PYTHON_VERSION }}"
|
python-version: "${{ env.PYTHON_VERSION }}"
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
|
|
||||||
with:
|
|
||||||
node-version: "26"
|
|
||||||
check-latest: "true"
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
persist-credentials: "false"
|
persist-credentials: "false"
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
||||||
|
with:
|
||||||
|
node-version-file: "./.nvmrc"
|
||||||
|
|
||||||
|
- name: Setup cache Node.js
|
||||||
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
|
with:
|
||||||
|
key: "nodejs-${{ runner.arch }}-${{ hashFiles('./.nvmrc', './package.json') }}"
|
||||||
|
path: "./client/simple/node_modules/"
|
||||||
|
|
||||||
- name: Setup cache Python
|
- name: Setup cache Python
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
with:
|
with:
|
||||||
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-
|
python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-
|
||||||
path: "./local/"
|
path: "./local/"
|
||||||
|
|
||||||
- name: Setup cache Node.js
|
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
|
||||||
with:
|
|
||||||
key: "nodejs-${{ runner.arch }}-${{ hashFiles('**/package-lock.json') }}"
|
|
||||||
restore-keys: |
|
|
||||||
nodejs-${{ runner.arch }}-
|
|
||||||
path: "./client/simple/node_modules/"
|
|
||||||
|
|
||||||
- name: Setup venv
|
- name: Setup venv
|
||||||
run: make V=1 install
|
run: make V=1 install
|
||||||
|
|
||||||
|
|||||||
34
.github/workflows/l10n.yml
vendored
34
.github/workflows/l10n.yml
vendored
@@ -26,27 +26,27 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update:
|
update:
|
||||||
if: github.event.workflow_run.conclusion == 'success' && github.repository_owner == 'searxng'
|
if: github.repository_owner == 'searxng' && github.event.workflow_run.conclusion == 'success'
|
||||||
name: Update
|
name: Update
|
||||||
runs-on: ubuntu-26.04-arm
|
runs-on: ubuntu-24.04-arm
|
||||||
permissions:
|
permissions:
|
||||||
# For "make V=1 weblate.push.translations"
|
# For "make V=1 weblate.push.translations"
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
|
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
|
||||||
with:
|
with:
|
||||||
python-version: "${{ env.PYTHON_VERSION }}"
|
python-version: "${{ env.PYTHON_VERSION }}"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
token: "${{ secrets.WEBLATE_GITHUB_TOKEN }}"
|
token: "${{ secrets.WEBLATE_GITHUB_TOKEN }}"
|
||||||
fetch-depth: "0"
|
fetch-depth: "0"
|
||||||
|
|
||||||
- name: Setup cache Python
|
- name: Setup cache Python
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
with:
|
with:
|
||||||
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
@@ -59,7 +59,7 @@ jobs:
|
|||||||
- name: Setup Weblate
|
- name: Setup Weblate
|
||||||
run: |
|
run: |
|
||||||
mkdir -p ~/.config
|
mkdir -p ~/.config
|
||||||
echo "${{ secrets.WEBLATE_CONFIG }}" >~/.config/weblate
|
echo "${{ secrets.WEBLATE_CONFIG }}" > ~/.config/weblate
|
||||||
|
|
||||||
- name: Setup Git
|
- name: Setup Git
|
||||||
run: |
|
run: |
|
||||||
@@ -74,7 +74,7 @@ jobs:
|
|||||||
github.repository_owner == 'searxng'
|
github.repository_owner == 'searxng'
|
||||||
&& (github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
|
&& (github.event_name == 'workflow_dispatch' || github.event_name == 'schedule')
|
||||||
name: Pull Request
|
name: Pull Request
|
||||||
runs-on: ubuntu-26.04-arm
|
runs-on: ubuntu-24.04-arm
|
||||||
permissions:
|
permissions:
|
||||||
# For "make V=1 weblate.translations.commit"
|
# For "make V=1 weblate.translations.commit"
|
||||||
contents: write
|
contents: write
|
||||||
@@ -83,18 +83,18 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
|
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
|
||||||
with:
|
with:
|
||||||
python-version: "${{ env.PYTHON_VERSION }}"
|
python-version: "${{ env.PYTHON_VERSION }}"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
with:
|
with:
|
||||||
token: "${{ secrets.WEBLATE_GITHUB_TOKEN }}"
|
token: "${{ secrets.WEBLATE_GITHUB_TOKEN }}"
|
||||||
fetch-depth: "0"
|
fetch-depth: "0"
|
||||||
|
|
||||||
- name: Setup cache Python
|
- name: Setup cache Python
|
||||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
|
||||||
with:
|
with:
|
||||||
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
@@ -107,7 +107,7 @@ jobs:
|
|||||||
- name: Setup Weblate
|
- name: Setup Weblate
|
||||||
run: |
|
run: |
|
||||||
mkdir -p ~/.config
|
mkdir -p ~/.config
|
||||||
echo "${{ secrets.WEBLATE_CONFIG }}" >~/.config/weblate
|
echo "${{ secrets.WEBLATE_CONFIG }}" > ~/.config/weblate
|
||||||
|
|
||||||
- name: Setup Git
|
- name: Setup Git
|
||||||
run: |
|
run: |
|
||||||
@@ -118,17 +118,23 @@ jobs:
|
|||||||
run: make V=1 weblate.translations.commit
|
run: make V=1 weblate.translations.commit
|
||||||
|
|
||||||
- name: Create PR
|
- name: Create PR
|
||||||
|
id: cpr
|
||||||
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
|
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
|
||||||
with:
|
with:
|
||||||
author: "searxng-bot <searxng-bot@users.noreply.github.com>"
|
author: "searxng-bot <searxng-bot@users.noreply.github.com>"
|
||||||
committer: "searxng-bot <searxng-bot@users.noreply.github.com>"
|
committer: "searxng-bot <searxng-bot@users.noreply.github.com>"
|
||||||
title: "[mod] i18n: update translations from Weblate"
|
title: "[l10n] update translations from Weblate"
|
||||||
commit-message: "[mod] i18n: update translations from Weblate"
|
commit-message: "[l10n] update translations from Weblate"
|
||||||
branch: "translations_update"
|
branch: "translations_update"
|
||||||
delete-branch: "true"
|
delete-branch: "true"
|
||||||
draft: "false"
|
draft: "false"
|
||||||
signoff: "false"
|
signoff: "false"
|
||||||
body: |
|
body: |
|
||||||
Update translations from Weblate
|
[l10n] update translations from Weblate
|
||||||
labels: |
|
labels: |
|
||||||
area:i18n
|
area:i18n
|
||||||
|
|
||||||
|
- name: Display information
|
||||||
|
run: |
|
||||||
|
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
||||||
|
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
||||||
|
|||||||
46
.github/workflows/security.yml
vendored
Normal file
46
.github/workflows/security.yml
vendored
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
---
|
||||||
|
name: Security
|
||||||
|
|
||||||
|
# yamllint disable-line rule:truthy
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
schedule:
|
||||||
|
- cron: "42 05 * * *"
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.workflow }}
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
container:
|
||||||
|
if: github.repository_owner == 'searxng'
|
||||||
|
name: Container
|
||||||
|
runs-on: ubuntu-24.04-arm
|
||||||
|
permissions:
|
||||||
|
security-events: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
|
with:
|
||||||
|
persist-credentials: "false"
|
||||||
|
|
||||||
|
- name: Sync GHCS from Docker Scout
|
||||||
|
uses: docker/scout-action@cd72f264beff1cd72735de31148b9d3244a0234a # v1.21.0
|
||||||
|
with:
|
||||||
|
organization: "searxng"
|
||||||
|
dockerhub-user: "${{ secrets.DOCKER_USER }}"
|
||||||
|
dockerhub-password: "${{ secrets.DOCKER_TOKEN }}"
|
||||||
|
image: "registry://ghcr.io/searxng/searxng:latest"
|
||||||
|
command: "cves"
|
||||||
|
sarif-file: "./scout.sarif"
|
||||||
|
exit-code: "false"
|
||||||
|
write-comment: "false"
|
||||||
|
|
||||||
|
- name: Upload SARIFs
|
||||||
|
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
|
||||||
|
with:
|
||||||
|
sarif_file: "./scout.sarif"
|
||||||
2
Makefile
2
Makefile
@@ -63,7 +63,7 @@ format: format.python format.shell
|
|||||||
# wrap ./manage script
|
# wrap ./manage script
|
||||||
|
|
||||||
MANAGE += weblate.translations.commit weblate.push.translations
|
MANAGE += weblate.translations.commit weblate.push.translations
|
||||||
MANAGE += data.all data.traits data.useragents data.locales data.currencies
|
MANAGE += data.all data.traits data.useragents data.gsa_useragents data.locales data.currencies
|
||||||
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 += podman.build
|
MANAGE += podman.build
|
||||||
MANAGE += docker.build docker.buildx
|
MANAGE += docker.build docker.buildx
|
||||||
|
|||||||
1195
client/simple/package-lock.json
generated
1195
client/simple/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -29,21 +29,21 @@
|
|||||||
"swiped-events": "1.2.0"
|
"swiped-events": "1.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "2.5.5",
|
"@biomejs/biome": "2.5.1",
|
||||||
"@types/node": "^26.1.1",
|
"@types/node": "^26.0.1",
|
||||||
"browserslist": "^4.28.7",
|
"browserslist": "^4.28.4",
|
||||||
"browserslist-to-esbuild": "^2.1.1",
|
"browserslist-to-esbuild": "^2.1.1",
|
||||||
"edge.js": "^6.5.1",
|
"edge.js": "^6.5.1",
|
||||||
"less": "^4.8.0",
|
"less": "^4.6.7",
|
||||||
"mathjs": "^15.2.0",
|
"mathjs": "^15.2.0",
|
||||||
"sharp": "~0.35.3",
|
"sharp": "~0.35.2",
|
||||||
"sort-package-json": "^4.0.0",
|
"sort-package-json": "^4.0.0",
|
||||||
"stylelint": "^17.14.1",
|
"stylelint": "^17.14.0",
|
||||||
"stylelint-config-standard-less": "^4.1.0",
|
"stylelint-config-standard-less": "^4.1.0",
|
||||||
"stylelint-prettier": "^5.0.3",
|
"stylelint-prettier": "^5.0.3",
|
||||||
"svgo": "^4.0.2",
|
"svgo": "^4.0.1",
|
||||||
"typescript": "~7.0.2",
|
"typescript": "~6.0.3",
|
||||||
"vite": "^8.1.5",
|
"vite": "^8.1.0",
|
||||||
"vite-bundle-analyzer": "^1.3.9"
|
"vite-bundle-analyzer": "^1.3.8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,13 @@ import { assertElement } from "../util/assertElement.ts";
|
|||||||
|
|
||||||
const fetchResults = async (qInput: HTMLInputElement, query: string): Promise<void> => {
|
const fetchResults = async (qInput: HTMLInputElement, query: string): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
const res = await http("GET", `./autocompleter?q=${query}`);
|
let res: Response;
|
||||||
|
|
||||||
|
if (settings.method === "GET") {
|
||||||
|
res = await http("GET", `./autocompleter?q=${query}`);
|
||||||
|
} else {
|
||||||
|
res = await http("POST", "./autocompleter", { body: new URLSearchParams({ q: query }) });
|
||||||
|
}
|
||||||
|
|
||||||
const results = await res.json();
|
const results = await res.json();
|
||||||
|
|
||||||
|
|||||||
@@ -35,9 +35,8 @@ const imageLoader = (resultElement: HTMLElement): void => {
|
|||||||
}, 1000) as unknown as number;
|
}, 1000) as unknown as number;
|
||||||
};
|
};
|
||||||
|
|
||||||
const imageThumbnails: NodeListOf<HTMLImageElement> = document.querySelectorAll<HTMLImageElement>(
|
const imageThumbnails: NodeListOf<HTMLImageElement> =
|
||||||
"#urls img.image_thumbnail, img.thumbnail"
|
document.querySelectorAll<HTMLImageElement>("#urls img.image_thumbnail");
|
||||||
);
|
|
||||||
for (const thumbnail of imageThumbnails) {
|
for (const thumbnail of imageThumbnails) {
|
||||||
if (thumbnail.complete && thumbnail.naturalWidth === 0) {
|
if (thumbnail.complete && thumbnail.naturalWidth === 0) {
|
||||||
thumbnail.src = `${settings.theme_static_path}/img/img_load_error.svg`;
|
thumbnail.src = `${settings.theme_static_path}/img/img_load_error.svg`;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM docker.io/searxng/base:searxng-builder AS builder
|
FROM ghcr.io/searxng/base:searxng-builder AS builder
|
||||||
|
|
||||||
COPY ./requirements.txt ./requirements-server.txt ./
|
COPY ./requirements.txt ./requirements-server.txt ./
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ ARG CONTAINER_IMAGE_ORGANIZATION="searxng"
|
|||||||
ARG CONTAINER_IMAGE_NAME="searxng"
|
ARG CONTAINER_IMAGE_NAME="searxng"
|
||||||
|
|
||||||
FROM localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder AS builder
|
FROM localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder AS builder
|
||||||
FROM docker.io/searxng/base:searxng AS dist
|
FROM ghcr.io/searxng/base:searxng AS dist
|
||||||
|
|
||||||
COPY --chown=977:977 --from=builder /usr/local/searxng/.venv/ ./.venv/
|
COPY --chown=977:977 --from=builder /usr/local/searxng/.venv/ ./.venv/
|
||||||
COPY --chown=977:977 --from=builder /usr/local/searxng/searx/ ./searx/
|
COPY --chown=977:977 --from=builder /usr/local/searxng/searx/ ./searx/
|
||||||
|
|||||||
@@ -112,15 +112,6 @@ if [ "$(id -u)" -eq 0 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# ENVs aliases
|
# ENVs aliases
|
||||||
# https://github.com/searxng/searxng/issues/5934
|
export GRANIAN_PORT="${SEARXNG_PORT:-$GRANIAN_PORT}"
|
||||||
case "${SEARXNG_PORT:-}" in
|
|
||||||
'') ;;
|
|
||||||
*[!0-9]*)
|
|
||||||
unset SEARXNG_PORT
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
export GRANIAN_PORT="$SEARXNG_PORT"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
exec /usr/local/searxng/.venv/bin/granian searx.webapp:app
|
exec /usr/local/searxng/.venv/bin/granian searx.webapp:app
|
||||||
|
|||||||
@@ -283,12 +283,12 @@ container images are not officially supported):
|
|||||||
$ make container
|
$ make container
|
||||||
|
|
||||||
$ docker images
|
$ docker images
|
||||||
REPOSITORY TAG IMAGE ID SIZE
|
REPOSITORY TAG IMAGE ID CREATED SIZE
|
||||||
localhost/searxng/searxng 2026.6.19-93f66bfb4 ... 265 MB
|
localhost/searxng/searxng 2025.8.1-3d96414 ... About a minute ago 183 MB
|
||||||
localhost/searxng/searxng latest ... 265 MB
|
localhost/searxng/searxng latest ... About a minute ago 183 MB
|
||||||
localhost/searxng/searxng builder ... 687 MB
|
localhost/searxng/searxng builder ... About a minute ago 524 MB
|
||||||
docker.io/searxng/base searxng-builder ... 565 MB
|
ghcr.io/searxng/base searxng-builder ... 2 days ago 378 MB
|
||||||
docker.io/searxng/base searxng ... 143 MB
|
ghcr.io/searxng/base searxng ... 2 days ago 42.2 MB
|
||||||
|
|
||||||
Migrate from ``searxng-docker``
|
Migrate from ``searxng-docker``
|
||||||
===============================
|
===============================
|
||||||
|
|||||||
@@ -29,11 +29,10 @@ By default and without any extensions, SearXNG serves these resolvers:
|
|||||||
- ``duckduckgo``
|
- ``duckduckgo``
|
||||||
- ``allesedv``
|
- ``allesedv``
|
||||||
- ``google``
|
- ``google``
|
||||||
- ``kagi``
|
|
||||||
- ``yandex``
|
- ``yandex``
|
||||||
|
|
||||||
With the above setting favicons are displayed, the user has the option to
|
With the above setting favicons are displayed, the user has the option to
|
||||||
deactivate this feature in their settings. If the user is to have the option of
|
deactivate this feature in his settings. If the user is to have the option of
|
||||||
selecting from several *resolvers*, a further setting is required / but this
|
selecting from several *resolvers*, a further setting is required / but this
|
||||||
setting will be discussed :ref:`later <register resolvers>` in this article,
|
setting will be discussed :ref:`later <register resolvers>` in this article,
|
||||||
first we have to setup the favicons cache.
|
first we have to setup the favicons cache.
|
||||||
@@ -209,7 +208,6 @@ choose from, the following configuration could be used:
|
|||||||
"duckduckgo" = "searx.favicons.resolvers.duckduckgo"
|
"duckduckgo" = "searx.favicons.resolvers.duckduckgo"
|
||||||
"allesedv" = "searx.favicons.resolvers.allesedv"
|
"allesedv" = "searx.favicons.resolvers.allesedv"
|
||||||
# "google" = "searx.favicons.resolvers.google"
|
# "google" = "searx.favicons.resolvers.google"
|
||||||
# "kagi" = "searx.favicons.resolvers.kagi"
|
|
||||||
# "yandex" = "searx.favicons.resolvers.yandex"
|
# "yandex" = "searx.favicons.resolvers.yandex"
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
@@ -228,7 +226,6 @@ into the *proxy*:
|
|||||||
- :py:obj:`searx.favicons.resolvers.duckduckgo`
|
- :py:obj:`searx.favicons.resolvers.duckduckgo`
|
||||||
- :py:obj:`searx.favicons.resolvers.allesedv`
|
- :py:obj:`searx.favicons.resolvers.allesedv`
|
||||||
- :py:obj:`searx.favicons.resolvers.google`
|
- :py:obj:`searx.favicons.resolvers.google`
|
||||||
- :py:obj:`searx.favicons.resolvers.kagi`
|
|
||||||
- :py:obj:`searx.favicons.resolvers.yandex`
|
- :py:obj:`searx.favicons.resolvers.yandex`
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,6 @@
|
|||||||
- ``dbpedia``
|
- ``dbpedia``
|
||||||
- ``duckduckgo``
|
- ``duckduckgo``
|
||||||
- ``google``
|
- ``google``
|
||||||
- ``kagi``
|
|
||||||
- ``mwmbl``
|
- ``mwmbl``
|
||||||
- ``naver``
|
- ``naver``
|
||||||
- ``privacywall``
|
- ``privacywall``
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
.. _exaapi engine:
|
|
||||||
|
|
||||||
==============
|
|
||||||
Exa API Engine
|
|
||||||
==============
|
|
||||||
|
|
||||||
.. automodule:: searx.engines.exaapi
|
|
||||||
:members:
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
.. _jina engine:
|
|
||||||
|
|
||||||
===========
|
|
||||||
Jina Engine
|
|
||||||
===========
|
|
||||||
|
|
||||||
.. automodule:: searx.engines.jina
|
|
||||||
:members:
|
|
||||||
8
docs/dev/engines/online/presearch.rst
Normal file
8
docs/dev/engines/online/presearch.rst
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
.. _engine presearch:
|
||||||
|
|
||||||
|
================
|
||||||
|
Presearch Engine
|
||||||
|
================
|
||||||
|
|
||||||
|
.. automodule:: searx.engines.presearch
|
||||||
|
:members:
|
||||||
@@ -4,32 +4,31 @@
|
|||||||
Search API
|
Search API
|
||||||
==========
|
==========
|
||||||
|
|
||||||
SearXNG supports querying via a simple HTTP API. Two endpoints, ``/`` and
|
SearXNG supports querying via a simple HTTP API.
|
||||||
``/search``, are supported for both GET and POST methods. The ``GET`` method
|
Two endpoints, ``/`` and ``/search``, are supported for both GET and POST methods.
|
||||||
expects parameters as URL query parameters, while the POST method expects
|
The GET method expects parameters as URL query parameters, while the POST method expects parameters as form data.
|
||||||
parameters as form data (``application/x-www-form-urlencoded``).
|
|
||||||
|
|
||||||
If you want to consume the results as JSON, CSV, or RSS, you need to set the
|
If you want to consume the results as JSON, CSV, or RSS, you need to set the
|
||||||
``format`` parameter accordingly. Supported formats are defined in
|
``format`` parameter accordingly. Supported formats are defined in ``settings.yml``, under the ``search`` section.
|
||||||
``settings.yml``, under the :ref:`settings search` section. Requesting an
|
Requesting an unset format will return a 403 Forbidden error. Be aware that many public instances have these formats disabled.
|
||||||
unset format will return a 403 Forbidden error. Be aware that many public
|
|
||||||
instances have these formats disabled.
|
|
||||||
|
|
||||||
Endpoints:
|
Endpoints:
|
||||||
|
|
||||||
.. code::
|
``GET /``
|
||||||
|
``GET /search``
|
||||||
|
|
||||||
GET /
|
``POST /``
|
||||||
GET /search
|
``POST /search``
|
||||||
POST /
|
|
||||||
POST /search
|
|
||||||
|
|
||||||
example cURL calls:
|
example cURL calls:
|
||||||
|
|
||||||
.. code:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
curl 'https://searx.example.org/search?q=searxng&format=json'
|
curl 'https://searx.example.org/search?q=searxng&format=json'
|
||||||
|
|
||||||
curl -X POST 'https://searx.example.org/search' -d 'q=searxng&format=csv'
|
curl -X POST 'https://searx.example.org/search' -d 'q=searxng&format=csv'
|
||||||
|
|
||||||
curl -L -X POST -d 'q=searxng&format=json' 'https://searx.example.org/'
|
curl -L -X POST -d 'q=searxng&format=json' 'https://searx.example.org/'
|
||||||
|
|
||||||
Parameters
|
Parameters
|
||||||
@@ -54,27 +53,90 @@ Parameters
|
|||||||
Comma separated list, specifies the active search categories (see
|
Comma separated list, specifies the active search categories (see
|
||||||
:ref:`configured engines`)
|
:ref:`configured engines`)
|
||||||
|
|
||||||
|
``engines`` : optional
|
||||||
|
Comma separated list, specifies the active search engines (see
|
||||||
|
:ref:`configured engines`).
|
||||||
|
|
||||||
``language`` : default from :ref:`settings search`
|
``language`` : default from :ref:`settings search`
|
||||||
Code of the language.
|
Code of the language.
|
||||||
|
|
||||||
``pageno`` : default ``1``
|
``pageno`` : default ``1``
|
||||||
Search page number.
|
Search page number.
|
||||||
|
|
||||||
``time_range`` : optional : [ ``day``, ``month``, ``year`` ]
|
``time_range`` : optional
|
||||||
|
[ ``day``, ``month``, ``year`` ]
|
||||||
|
|
||||||
Time range of search for engines which support it. See if an engine supports
|
Time range of search for engines which support it. See if an engine supports
|
||||||
time range search in the preferences page of an instance.
|
time range search in the preferences page of an instance.
|
||||||
|
|
||||||
``format`` : optional : [ ``json``, ``csv``, ``rss`` ]
|
``format`` : optional
|
||||||
|
[ ``json``, ``csv``, ``rss`` ]
|
||||||
|
|
||||||
Output format of results. Format needs to be activated in :ref:`settings
|
Output format of results. Format needs to be activated in :ref:`settings
|
||||||
search`.
|
search`.
|
||||||
|
|
||||||
``safesearch`` : default from :ref:`settings search` : [ ``0``, ``1``, ``2`` ]
|
``results_on_new_tab`` : default ``0``
|
||||||
|
[ ``0``, ``1`` ]
|
||||||
|
|
||||||
|
Open search results on new tab.
|
||||||
|
|
||||||
|
``image_proxy`` : default from :ref:`settings server`
|
||||||
|
[ ``True``, ``False`` ]
|
||||||
|
|
||||||
|
Proxy image results through SearXNG.
|
||||||
|
|
||||||
|
``autocomplete`` : default from :ref:`settings search`
|
||||||
|
[ ``google``, ``dbpedia``, ``duckduckgo``, ``mwmbl``, ``startpage``,
|
||||||
|
``privacywall``, ``wikipedia``, ``swisscows``, ``qwant`` ]
|
||||||
|
|
||||||
|
Service which completes words as you type.
|
||||||
|
|
||||||
|
``safesearch`` : default from :ref:`settings search`
|
||||||
|
[ ``0``, ``1``, ``2`` ]
|
||||||
|
|
||||||
Filter search results of engines which support safe search. See if an engine
|
Filter search results of engines which support safe search. See if an engine
|
||||||
supports safe search in the preferences page of an instance.
|
supports safe search in the preferences page of an instance.
|
||||||
|
|
||||||
``theme`` : default ``simple`` : [ ``simple`` ]
|
``theme`` : default ``simple``
|
||||||
|
[ ``simple`` ]
|
||||||
|
|
||||||
Theme of instance.
|
Theme of instance.
|
||||||
|
|
||||||
Please note, available themes depend on an instance. It is possible that an
|
Please note, available themes depend on an instance. It is possible that an
|
||||||
instance administrator deleted, created or renamed themes on their instance.
|
instance administrator deleted, created or renamed themes on their instance.
|
||||||
See the available options in the preferences page of the instance.
|
See the available options in the preferences page of the instance.
|
||||||
|
|
||||||
|
``enabled_plugins`` : optional
|
||||||
|
List of enabled plugins.
|
||||||
|
|
||||||
|
:default:
|
||||||
|
``Hash_plugin``, ``Self_Information``,
|
||||||
|
``Tracker_URL_remover``, ``Ahmia_blacklist``
|
||||||
|
|
||||||
|
:values:
|
||||||
|
.. enabled by default
|
||||||
|
|
||||||
|
``Hash_plugin``, ``Self_Information``,
|
||||||
|
``Tracker_URL_remover``, ``Ahmia_blacklist``,
|
||||||
|
|
||||||
|
.. disabled by default
|
||||||
|
|
||||||
|
``Hostnames_plugin``, ``Open_Access_DOI_rewrite``,
|
||||||
|
``Vim-like_hotkeys``, ``Tor_check_plugin``
|
||||||
|
|
||||||
|
``disabled_plugins``: optional
|
||||||
|
List of disabled plugins.
|
||||||
|
|
||||||
|
:default:
|
||||||
|
``Hostnames_plugin``, ``Open_Access_DOI_rewrite``,
|
||||||
|
``Vim-like_hotkeys``, ``Tor_check_plugin``
|
||||||
|
|
||||||
|
:values:
|
||||||
|
see values from ``enabled_plugins``
|
||||||
|
|
||||||
|
``enabled_engines`` : optional : *all* :origin:`engines <searx/engines>`
|
||||||
|
List of enabled engines.
|
||||||
|
|
||||||
|
``disabled_engines`` : optional : *all* :origin:`engines <searx/engines>`
|
||||||
|
List of disabled engines.
|
||||||
|
|
||||||
|
|||||||
@@ -20,11 +20,15 @@ If you don't trust anyone, you can set up your own, see :ref:`installation`.
|
|||||||
|
|
||||||
- :ref:`self hosted <installation>`
|
- :ref:`self hosted <installation>`
|
||||||
- :ref:`no user tracking / no profiling <SearXNG protect privacy>`
|
- :ref:`no user tracking / no profiling <SearXNG protect privacy>`
|
||||||
- javascript & cookies are optional
|
- script & cookies are optional
|
||||||
|
- secure, encrypted connections
|
||||||
- :ref:`{{engines | length}} search engines <configured engines>`
|
- :ref:`{{engines | length}} search engines <configured engines>`
|
||||||
- `58 translations <https://translate.codeberg.org/projects/searxng/searxng/>`_
|
- `58 translations <https://translate.codeberg.org/projects/searxng/searxng/>`_
|
||||||
- about 70 `well maintained <https://uptime.searxng.org/>`__ instances on searx.space_
|
- about 70 `well maintained <https://uptime.searxng.org/>`__ instances on searx.space_
|
||||||
- :ref:`easy integration of search engines <demo online engine>`
|
- :ref:`easy integration of search engines <demo online engine>`
|
||||||
|
- professional development: `CI <https://github.com/searxng/searxng/actions>`_,
|
||||||
|
`quality assurance <https://dev.searxng.org/>`_ &
|
||||||
|
`automated tested UI <https://dev.searxng.org/screenshots.html>`_
|
||||||
|
|
||||||
.. sidebar:: be a part
|
.. sidebar:: be a part
|
||||||
|
|
||||||
|
|||||||
2
manage
2
manage
@@ -48,7 +48,7 @@ PATH="${PY_ENV}/bin:${REPO_ROOT}/node_modules/.bin:${GOROOT}/bin:${GOPATH}/bin:$
|
|||||||
|
|
||||||
PYOBJECTS="searx"
|
PYOBJECTS="searx"
|
||||||
PY_SETUP_EXTRAS='[test]'
|
PY_SETUP_EXTRAS='[test]'
|
||||||
GECKODRIVER_VERSION="v0.37.0"
|
GECKODRIVER_VERSION="v0.36.0"
|
||||||
# SPHINXOPTS=
|
# SPHINXOPTS=
|
||||||
BLACK_OPTIONS=("--target-version" "py311" "--line-length" "120" "--skip-string-normalization")
|
BLACK_OPTIONS=("--target-version" "py311" "--line-length" "120" "--skip-string-normalization")
|
||||||
BLACK_TARGETS=("--exclude" "(searx/static|searx/languages.py)" "--include" 'searxng.msg|\.pyi?$' "searx" "searxng_extra" "tests")
|
BLACK_TARGETS=("--exclude" "(searx/static|searx/languages.py)" "--include" 'searxng.msg|\.pyi?$' "searx" "searxng_extra" "tests")
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ cov-core==1.15.0
|
|||||||
black==25.9.0
|
black==25.9.0
|
||||||
pylint==4.0.6
|
pylint==4.0.6
|
||||||
splinter==0.21.0
|
splinter==0.21.0
|
||||||
selenium==4.46.0
|
selenium==4.45.0
|
||||||
Sphinx==8.2.3;python_version <= "3.11"
|
Sphinx==8.2.3;python_version <= "3.11"
|
||||||
Sphinx==9.1.0; python_version > "3.11"
|
Sphinx==9.1.0; python_version > "3.11"
|
||||||
sphinx-issues==6.0.0
|
sphinx-issues==6.0.0
|
||||||
@@ -18,11 +18,11 @@ myst-parser==5.0.0
|
|||||||
linuxdoc==20260504
|
linuxdoc==20260504
|
||||||
aiounittest==1.5.0
|
aiounittest==1.5.0
|
||||||
yamllint==1.38.0
|
yamllint==1.38.0
|
||||||
wlc==2.1.0
|
wlc==2.0.0
|
||||||
coloredlogs==15.0.1
|
coloredlogs==15.0.1
|
||||||
docutils>=0.21.2;python_version <= "3.11"
|
docutils>=0.21.2;python_version <= "3.11"
|
||||||
docutils>=0.22.4; python_version > "3.11"
|
docutils>=0.22.4; python_version > "3.11"
|
||||||
parameterized==0.9.0
|
parameterized==0.9.0
|
||||||
granian[reload]==2.7.9
|
granian[reload]==2.7.6
|
||||||
basedpyright==1.39.9
|
basedpyright==1.39.8
|
||||||
types-lxml==2026.2.16
|
types-lxml==2026.2.16
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
granian==2.7.9
|
granian==2.7.6
|
||||||
granian[pname]==2.7.9
|
granian[pname]==2.7.6
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
certifi==2026.7.22
|
certifi==2026.6.17
|
||||||
babel==2.18.0
|
babel==2.18.0
|
||||||
flask-babel==4.0.0
|
flask-babel==4.0.0
|
||||||
flask==3.1.3
|
flask==3.1.3
|
||||||
@@ -13,7 +13,7 @@ sniffio==1.3.1
|
|||||||
valkey==6.1.1
|
valkey==6.1.1
|
||||||
markdown-it-py==4.2.0
|
markdown-it-py==4.2.0
|
||||||
msgspec==0.21.1
|
msgspec==0.21.1
|
||||||
typer==0.27.0
|
typer==0.26.7
|
||||||
isodate==0.7.2
|
isodate==0.7.2
|
||||||
whitenoise==6.12.0
|
whitenoise==6.12.0
|
||||||
typing-extensions==4.16.0
|
typing-extensions==4.15.0
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ from . import Answerer, AnswererInfo
|
|||||||
|
|
||||||
def random_characters():
|
def random_characters():
|
||||||
random_string_letters = string.ascii_lowercase + string.digits + string.ascii_uppercase
|
random_string_letters = string.ascii_lowercase + string.digits + string.ascii_uppercase
|
||||||
return random.choices(random_string_letters, k=random.randint(8, 32))
|
return [random.choice(random_string_letters) for _ in range(random.randint(8, 32))]
|
||||||
|
|
||||||
|
|
||||||
def random_string():
|
def random_string():
|
||||||
|
|||||||
@@ -21,8 +21,6 @@ from searx.engines import (
|
|||||||
from searx.network import get as http_get, post as http_post
|
from searx.network import get as http_get, post as http_post
|
||||||
from searx.exceptions import SearxEngineResponseException
|
from searx.exceptions import SearxEngineResponseException
|
||||||
from searx.utils import extr, gen_useragent
|
from searx.utils import extr, gen_useragent
|
||||||
from searx.data import ENGINE_TRAITS
|
|
||||||
from searx.enginelib.traits import EngineTraits
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
@@ -62,7 +60,7 @@ def bing(query: str, _sxng_locale: str) -> list[str]:
|
|||||||
# bing search autocompleter
|
# bing search autocompleter
|
||||||
base_url = "https://www.bing.com/AS/Suggestions?"
|
base_url = "https://www.bing.com/AS/Suggestions?"
|
||||||
# cvid has to be a 32 character long string consisting of numbers and uppsercase characters
|
# cvid has to be a 32 character long string consisting of numbers and uppsercase characters
|
||||||
cvid = ''.join(random.choices(string.ascii_uppercase + string.digits, k=32))
|
cvid = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(32))
|
||||||
response = get(base_url + urlencode({'qry': query, 'csr': 1, 'cvid': cvid}))
|
response = get(base_url + urlencode({'qry': query, 'csr': 1, 'cvid': cvid}))
|
||||||
results: list[str] = []
|
results: list[str] = []
|
||||||
|
|
||||||
@@ -135,9 +133,7 @@ def google_complete(query: str, sxng_locale: str) -> list[str]:
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
data = ENGINE_TRAITS.get("google") or {}
|
google_info: dict[str, t.Any] = google.get_google_info({'searxng_locale': sxng_locale}, engines['google'].traits)
|
||||||
traits = EngineTraits(**data)
|
|
||||||
google_info: dict[str, t.Any] = google.get_google_info({'searxng_locale': sxng_locale}, traits)
|
|
||||||
url = 'https://{subdomain}/complete/search?{args}'
|
url = 'https://{subdomain}/complete/search?{args}'
|
||||||
args = urlencode(
|
args = urlencode(
|
||||||
{
|
{
|
||||||
@@ -157,24 +153,6 @@ def google_complete(query: str, sxng_locale: str) -> list[str]:
|
|||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
def kagi(query: str, sxng_locale: str) -> list[str]:
|
|
||||||
"""Autocomplete from Kagi."""
|
|
||||||
|
|
||||||
args: dict[str, str] = {'q': query}
|
|
||||||
|
|
||||||
if '-' in sxng_locale:
|
|
||||||
args['r'] = sxng_locale.split('-')[1].lower()
|
|
||||||
|
|
||||||
resp = get("https://kagisuggest.com/api/autosuggest?" + urlencode(args))
|
|
||||||
results: list[str] = []
|
|
||||||
|
|
||||||
if resp.ok:
|
|
||||||
data = resp.json()
|
|
||||||
if len(data) > 1:
|
|
||||||
results = data[1]
|
|
||||||
return results
|
|
||||||
|
|
||||||
|
|
||||||
def mwmbl(query: str, _sxng_locale: str) -> list[str]:
|
def mwmbl(query: str, _sxng_locale: str) -> list[str]:
|
||||||
"""Autocomplete from Mwmbl_."""
|
"""Autocomplete from Mwmbl_."""
|
||||||
|
|
||||||
@@ -398,7 +376,6 @@ backends: dict[str, t.Callable[[str, str], list[str]]] = {
|
|||||||
'dbpedia': dbpedia,
|
'dbpedia': dbpedia,
|
||||||
'duckduckgo': duckduckgo,
|
'duckduckgo': duckduckgo,
|
||||||
'google': google_complete,
|
'google': google_complete,
|
||||||
'kagi': kagi,
|
|
||||||
'mwmbl': mwmbl,
|
'mwmbl': mwmbl,
|
||||||
'naver': naver,
|
'naver': naver,
|
||||||
'privacywall': privacywall,
|
'privacywall': privacywall,
|
||||||
|
|||||||
@@ -151,6 +151,6 @@ def get_token() -> str:
|
|||||||
if token:
|
if token:
|
||||||
token = token.decode('UTF-8') # type: ignore
|
token = token.decode('UTF-8') # type: ignore
|
||||||
else:
|
else:
|
||||||
token = ''.join(random.choices(string.ascii_lowercase + string.digits, k=16))
|
token = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(16))
|
||||||
valkey_client.set(TOKEN_KEY, token, ex=TOKEN_LIVE_TIME)
|
valkey_client.set(TOKEN_KEY, token, ex=TOKEN_LIVE_TIME)
|
||||||
return token
|
return token
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ class ExpireCacheCfg(msgspec.Struct): # pylint: disable=too-few-public-methods
|
|||||||
MAXHOLD_TIME: int = 60 * 60 * 24 * 7 # 7 days
|
MAXHOLD_TIME: int = 60 * 60 * 24 * 7 # 7 days
|
||||||
"""Hold time (default in sec.), after which a value is removed from the cache."""
|
"""Hold time (default in sec.), after which a value is removed from the cache."""
|
||||||
|
|
||||||
MAINTENANCE_PERIOD: int = 60 * 60 # 1h
|
MAINTENANCE_PERIOD: int = 60 * 60 # 2h
|
||||||
"""Maintenance period in seconds / when :py:obj:`MAINTENANCE_MODE` is set to
|
"""Maintenance period in seconds / when :py:obj:`MAINTENANCE_MODE` is set to
|
||||||
``auto``."""
|
``auto``."""
|
||||||
|
|
||||||
@@ -458,22 +458,12 @@ class ExpireCacheSQLite(sqlitedb.SQLiteAppl, ExpireCache):
|
|||||||
# Before values are taken from the table, a maintenance interval may
|
# Before values are taken from the table, a maintenance interval may
|
||||||
# need to be carried out.
|
# need to be carried out.
|
||||||
self.maintenance()
|
self.maintenance()
|
||||||
sql = f"SELECT value, expire FROM {table} WHERE key = ?"
|
sql = f"SELECT value FROM {table} WHERE key = ?"
|
||||||
row = self.DB.execute(sql, (key,)).fetchone()
|
row = self.DB.execute(sql, (key,)).fetchone()
|
||||||
if row is None:
|
if row is None:
|
||||||
return default
|
return default
|
||||||
|
|
||||||
# Check if value is expired. It's possible that it's expired but has not
|
return self.deserialize(row[0])
|
||||||
# yet been automatically deleted by the periodic maintenance
|
|
||||||
(value, expire) = row
|
|
||||||
now = time.time()
|
|
||||||
if expire < now:
|
|
||||||
# The record is deleted during the maintenance interval. Deleting
|
|
||||||
# the record at this point offers no advantage, as a SELECT
|
|
||||||
# statement must be executed for every cache.get request anyways.
|
|
||||||
return default
|
|
||||||
|
|
||||||
return self.deserialize(value)
|
|
||||||
|
|
||||||
def pairs(self, ctx: str) -> Iterator[tuple[str, typing.Any]]:
|
def pairs(self, ctx: str) -> Iterator[tuple[str, typing.Any]]:
|
||||||
"""Iterate over key/value pairs from table given by argument ``ctx``.
|
"""Iterate over key/value pairs from table given by argument ``ctx``.
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ make data.all
|
|||||||
"""
|
"""
|
||||||
# pylint: disable=invalid-name
|
# pylint: disable=invalid-name
|
||||||
|
|
||||||
__all__ = ["ahmia_blacklist_loader", "data_dir", "get_cache"]
|
__all__ = ["ahmia_blacklist_loader", "gsa_useragents_loader", "data_dir", "get_cache"]
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import typing as t
|
import typing as t
|
||||||
@@ -63,6 +63,7 @@ lazy_globals = {
|
|||||||
"ENGINE_TRAITS": None,
|
"ENGINE_TRAITS": None,
|
||||||
"LOCALES": None,
|
"LOCALES": None,
|
||||||
"TRACKER_PATTERNS": TrackerPatternsDB(),
|
"TRACKER_PATTERNS": TrackerPatternsDB(),
|
||||||
|
"GSA_USER_AGENTS": None,
|
||||||
}
|
}
|
||||||
|
|
||||||
data_json_files = {
|
data_json_files = {
|
||||||
@@ -105,3 +106,24 @@ def ahmia_blacklist_loader() -> list[str]:
|
|||||||
"""
|
"""
|
||||||
with open(data_dir / 'ahmia_blacklist.txt', encoding='utf-8') as f:
|
with open(data_dir / 'ahmia_blacklist.txt', encoding='utf-8') as f:
|
||||||
return f.read().split()
|
return f.read().split()
|
||||||
|
|
||||||
|
|
||||||
|
def gsa_useragents_loader() -> list[str]:
|
||||||
|
"""Load data from `gsa_useragents.txt` and return a list of user agents
|
||||||
|
suitable for Google. The user agents are fetched by::
|
||||||
|
|
||||||
|
searxng_extra/update/update_gsa_useragents.py
|
||||||
|
|
||||||
|
This function is used by :py:mod:`searx.engines.google`.
|
||||||
|
|
||||||
|
"""
|
||||||
|
data = lazy_globals["GSA_USER_AGENTS"]
|
||||||
|
if data is not None:
|
||||||
|
return data
|
||||||
|
|
||||||
|
log.debug("init searx.data.%s", "GSA_USER_AGENTS")
|
||||||
|
|
||||||
|
with open(data_dir / 'gsa_useragents.txt', encoding='utf-8') as f:
|
||||||
|
lazy_globals["GSA_USER_AGENTS"] = f.read().splitlines()
|
||||||
|
|
||||||
|
return lazy_globals["GSA_USER_AGENTS"]
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -288,7 +288,7 @@
|
|||||||
"oc": "Kwanza",
|
"oc": "Kwanza",
|
||||||
"pa": "ਅੰਗੋਲਨ ਕਵਾਂਜ਼ਾ",
|
"pa": "ਅੰਗੋਲਨ ਕਵਾਂਜ਼ਾ",
|
||||||
"pl": "Kwanza",
|
"pl": "Kwanza",
|
||||||
"pt": "kwanza",
|
"pt": "Kwanza",
|
||||||
"ru": "ангольская кванза",
|
"ru": "ангольская кванза",
|
||||||
"si": "ක්වන්සා",
|
"si": "ක්වන්සා",
|
||||||
"sr": "анголска кванза",
|
"sr": "анголска кванза",
|
||||||
@@ -334,7 +334,6 @@
|
|||||||
"ro": "Peso argentinian",
|
"ro": "Peso argentinian",
|
||||||
"ru": "аргентинское песо",
|
"ru": "аргентинское песо",
|
||||||
"sk": "Argentinské peso",
|
"sk": "Argentinské peso",
|
||||||
"sl": "argentinski peso",
|
|
||||||
"sr": "аргентински пезос",
|
"sr": "аргентински пезос",
|
||||||
"sv": "Argentinsk peso",
|
"sv": "Argentinsk peso",
|
||||||
"ta": "ஆர்ஜென்டின பீசோ",
|
"ta": "ஆர்ஜென்டின பீசோ",
|
||||||
@@ -774,7 +773,7 @@
|
|||||||
"nl": "Boliviaanse boliviano",
|
"nl": "Boliviaanse boliviano",
|
||||||
"oc": "Boliviano",
|
"oc": "Boliviano",
|
||||||
"pa": "ਬੋਲੀਵੀਆਨੋ",
|
"pa": "ਬੋਲੀਵੀਆਨੋ",
|
||||||
"pl": "boliwiano",
|
"pl": "boliviano",
|
||||||
"pt": "Boliviano",
|
"pt": "Boliviano",
|
||||||
"ro": "boliviano",
|
"ro": "boliviano",
|
||||||
"ru": "боливиано",
|
"ru": "боливиано",
|
||||||
@@ -1108,7 +1107,7 @@
|
|||||||
"fi": "Kongon frangi",
|
"fi": "Kongon frangi",
|
||||||
"fr": "franc congolais",
|
"fr": "franc congolais",
|
||||||
"ga": "franc an Chongó",
|
"ga": "franc an Chongó",
|
||||||
"gl": "franco congolés",
|
"gl": "Franco congolés",
|
||||||
"he": "פרנק קונגולזי",
|
"he": "פרנק קונגולזי",
|
||||||
"hr": "Kongoanski franak",
|
"hr": "Kongoanski franak",
|
||||||
"hu": "kongói frank",
|
"hu": "kongói frank",
|
||||||
@@ -1637,7 +1636,7 @@
|
|||||||
"fi": "Algerian dinaari",
|
"fi": "Algerian dinaari",
|
||||||
"fr": "dinar algérien",
|
"fr": "dinar algérien",
|
||||||
"ga": "dinar na hAilgéire",
|
"ga": "dinar na hAilgéire",
|
||||||
"gl": "dinar alxeriano",
|
"gl": "Dinar alxeriano",
|
||||||
"he": "דינר אלג'ירי",
|
"he": "דינר אלג'ירי",
|
||||||
"hr": "Alžirski dinar",
|
"hr": "Alžirski dinar",
|
||||||
"hu": "algériai dinár",
|
"hu": "algériai dinár",
|
||||||
@@ -1652,7 +1651,7 @@
|
|||||||
"pap": "dinar argelino",
|
"pap": "dinar argelino",
|
||||||
"pl": "dinar algierski",
|
"pl": "dinar algierski",
|
||||||
"pt": "dinar argelino",
|
"pt": "dinar argelino",
|
||||||
"ro": "dinar algerian",
|
"ro": "Dinar algerian",
|
||||||
"ru": "алжирский динар",
|
"ru": "алжирский динар",
|
||||||
"sk": "Alžírský dinár",
|
"sk": "Alžírský dinár",
|
||||||
"sl": "alžirski dinar",
|
"sl": "alžirski dinar",
|
||||||
@@ -1787,7 +1786,7 @@
|
|||||||
"cy": "Ewro",
|
"cy": "Ewro",
|
||||||
"da": "Euro",
|
"da": "Euro",
|
||||||
"de": "Euro",
|
"de": "Euro",
|
||||||
"en": "euro",
|
"en": "Euro",
|
||||||
"eo": "eŭro",
|
"eo": "eŭro",
|
||||||
"es": "Euro",
|
"es": "Euro",
|
||||||
"et": "Euro",
|
"et": "Euro",
|
||||||
@@ -1804,7 +1803,7 @@
|
|||||||
"it": "Euro",
|
"it": "Euro",
|
||||||
"ja": "ユーロ",
|
"ja": "ユーロ",
|
||||||
"ko": "유로",
|
"ko": "유로",
|
||||||
"lt": "euras",
|
"lt": "Euras",
|
||||||
"lv": "eiro",
|
"lv": "eiro",
|
||||||
"ml": "യൂറോ",
|
"ml": "യൂറോ",
|
||||||
"ms": "Euro",
|
"ms": "Euro",
|
||||||
@@ -2003,7 +2002,7 @@
|
|||||||
"eo": "ganaa cedio",
|
"eo": "ganaa cedio",
|
||||||
"es": "cedi",
|
"es": "cedi",
|
||||||
"fi": "Cedi",
|
"fi": "Cedi",
|
||||||
"fr": "cedi",
|
"fr": "Cedi",
|
||||||
"ga": "cedi",
|
"ga": "cedi",
|
||||||
"gl": "Cedi",
|
"gl": "Cedi",
|
||||||
"he": "סדי גאני",
|
"he": "סדי גאני",
|
||||||
@@ -2760,7 +2759,7 @@
|
|||||||
"pa": "ਜਪਾਨੀ ਯੈੱਨ",
|
"pa": "ਜਪਾਨੀ ਯੈੱਨ",
|
||||||
"pl": "jen",
|
"pl": "jen",
|
||||||
"pt": "iene",
|
"pt": "iene",
|
||||||
"ro": "yen",
|
"ro": "yeni",
|
||||||
"ru": "японская иена",
|
"ru": "японская иена",
|
||||||
"sk": "jen",
|
"sk": "jen",
|
||||||
"sl": "japonski jen",
|
"sl": "japonski jen",
|
||||||
@@ -2953,7 +2952,7 @@
|
|||||||
"pap": "won nortkoreano",
|
"pap": "won nortkoreano",
|
||||||
"pl": "won północnokoreański",
|
"pl": "won północnokoreański",
|
||||||
"pt": "won norte-coreano",
|
"pt": "won norte-coreano",
|
||||||
"ro": "won nord-coreean",
|
"ro": "Won nord-coreean",
|
||||||
"ru": "вона КНДР",
|
"ru": "вона КНДР",
|
||||||
"sk": "severokorejsky won",
|
"sk": "severokorejsky won",
|
||||||
"sl": "severnokorejski von",
|
"sl": "severnokorejski von",
|
||||||
@@ -3095,7 +3094,6 @@
|
|||||||
"ca": "tenge",
|
"ca": "tenge",
|
||||||
"cs": "Tenge",
|
"cs": "Tenge",
|
||||||
"cy": "tenge Casachstan",
|
"cy": "tenge Casachstan",
|
||||||
"da": "Tenge",
|
|
||||||
"de": "Tenge",
|
"de": "Tenge",
|
||||||
"en": "Kazakhstani tenge",
|
"en": "Kazakhstani tenge",
|
||||||
"eo": "kazaĥa tengo",
|
"eo": "kazaĥa tengo",
|
||||||
@@ -3339,7 +3337,6 @@
|
|||||||
"fi": "Libyan dinaari",
|
"fi": "Libyan dinaari",
|
||||||
"fr": "dinar libyen",
|
"fr": "dinar libyen",
|
||||||
"ga": "dinar na Libia",
|
"ga": "dinar na Libia",
|
||||||
"gl": "dinar libio",
|
|
||||||
"he": "דינר לובי ",
|
"he": "דינר לובי ",
|
||||||
"hr": "Libijski dinar",
|
"hr": "Libijski dinar",
|
||||||
"hu": "líbiai dinár",
|
"hu": "líbiai dinár",
|
||||||
@@ -3542,7 +3539,6 @@
|
|||||||
"ja": "チャット",
|
"ja": "チャット",
|
||||||
"ko": "미얀마 짯",
|
"ko": "미얀마 짯",
|
||||||
"lt": "Kijatas",
|
"lt": "Kijatas",
|
||||||
"lv": "Kjats",
|
|
||||||
"ml": "ബർമ്മീസ് ക്യാറ്റ്",
|
"ml": "ബർമ്മീസ് ക്യാറ്റ്",
|
||||||
"nl": "Myanmarese kyat",
|
"nl": "Myanmarese kyat",
|
||||||
"oc": "Kyat",
|
"oc": "Kyat",
|
||||||
@@ -4314,7 +4310,7 @@
|
|||||||
"ar": "بيسو فلبيني",
|
"ar": "بيسو فلبيني",
|
||||||
"bg": "Филипинско песо",
|
"bg": "Филипинско песо",
|
||||||
"ca": "peso filipí",
|
"ca": "peso filipí",
|
||||||
"cs": "filipínské peso",
|
"cs": "Filipínské peso",
|
||||||
"de": "philippinischer Peso",
|
"de": "philippinischer Peso",
|
||||||
"en": "Philippine peso",
|
"en": "Philippine peso",
|
||||||
"eo": "filipina peso",
|
"eo": "filipina peso",
|
||||||
@@ -4618,7 +4614,7 @@
|
|||||||
"fi": "Serbian dinaari",
|
"fi": "Serbian dinaari",
|
||||||
"fr": "dinar serbe",
|
"fr": "dinar serbe",
|
||||||
"ga": "Dinar na Seirbia",
|
"ga": "Dinar na Seirbia",
|
||||||
"gl": "dinar serbio",
|
"gl": "Dinar serbio",
|
||||||
"he": "דינר סרבי",
|
"he": "דינר סרבי",
|
||||||
"hr": "srpski dinar",
|
"hr": "srpski dinar",
|
||||||
"hu": "szerb dinár",
|
"hu": "szerb dinár",
|
||||||
@@ -4836,7 +4832,6 @@
|
|||||||
"nl": "Seychelse roepie",
|
"nl": "Seychelse roepie",
|
||||||
"pl": "Rupia seszelska",
|
"pl": "Rupia seszelska",
|
||||||
"pt": "rupia das Seicheles",
|
"pt": "rupia das Seicheles",
|
||||||
"ro": "rupie seychelloză",
|
|
||||||
"ru": "сейшельская рупия",
|
"ru": "сейшельская рупия",
|
||||||
"sk": "Seychelská rupia",
|
"sk": "Seychelská rupia",
|
||||||
"sl": "sejšelska rupija",
|
"sl": "sejšelska rupija",
|
||||||
@@ -5067,7 +5062,6 @@
|
|||||||
"nl": "Somalische shilling",
|
"nl": "Somalische shilling",
|
||||||
"pl": "Szyling somalijski",
|
"pl": "Szyling somalijski",
|
||||||
"pt": "xelim somaliano",
|
"pt": "xelim somaliano",
|
||||||
"ro": "șiling somalez",
|
|
||||||
"ru": "сомалийский шиллинг",
|
"ru": "сомалийский шиллинг",
|
||||||
"sk": "Somálsky šiling",
|
"sk": "Somálsky šiling",
|
||||||
"sl": "somalski šiling",
|
"sl": "somalski šiling",
|
||||||
@@ -5337,7 +5331,7 @@
|
|||||||
"pa": "ਤਾਜਿਕਿਸਤਾਨੀ ਸੋਮੋਨੀ",
|
"pa": "ਤਾਜਿਕਿਸਤਾਨੀ ਸੋਮੋਨੀ",
|
||||||
"pl": "Somoni",
|
"pl": "Somoni",
|
||||||
"pt": "Somoni",
|
"pt": "Somoni",
|
||||||
"ro": "somoni tadjic",
|
"ro": "Somoni tadjic",
|
||||||
"ru": "таджикский сомони",
|
"ru": "таджикский сомони",
|
||||||
"sk": "tadžický som",
|
"sk": "tadžický som",
|
||||||
"sl": "tadžikistanski somoni",
|
"sl": "tadžikistanski somoni",
|
||||||
@@ -5400,7 +5394,6 @@
|
|||||||
"fi": "Tunisian dinaari",
|
"fi": "Tunisian dinaari",
|
||||||
"fr": "dinar tunisien",
|
"fr": "dinar tunisien",
|
||||||
"ga": "dinar na Túinéise",
|
"ga": "dinar na Túinéise",
|
||||||
"gl": "dinar tunisiano",
|
|
||||||
"he": "דינר תוניסאי",
|
"he": "דינר תוניסאי",
|
||||||
"hr": "tuniski dinar",
|
"hr": "tuniski dinar",
|
||||||
"hu": "tunéziai dinár",
|
"hu": "tunéziai dinár",
|
||||||
@@ -5773,7 +5766,7 @@
|
|||||||
"fi": "Uruguayn peso",
|
"fi": "Uruguayn peso",
|
||||||
"fr": "peso uruguayen",
|
"fr": "peso uruguayen",
|
||||||
"ga": "peso Uragua",
|
"ga": "peso Uragua",
|
||||||
"gl": "peso uruguaio",
|
"gl": "Peso uruguaio",
|
||||||
"he": "פסו של אורוגוואי",
|
"he": "פסו של אורוגוואי",
|
||||||
"hr": "Urugvajski pezo",
|
"hr": "Urugvajski pezo",
|
||||||
"hu": "uruguayi peso",
|
"hu": "uruguayi peso",
|
||||||
@@ -5887,7 +5880,6 @@
|
|||||||
"ja": "ドン",
|
"ja": "ドン",
|
||||||
"ko": "베트남 동",
|
"ko": "베트남 동",
|
||||||
"lt": "Vietnamo dongas",
|
"lt": "Vietnamo dongas",
|
||||||
"ms": "Dồng Vietnam",
|
|
||||||
"nl": "Vietnamese dong",
|
"nl": "Vietnamese dong",
|
||||||
"oc": "Dong",
|
"oc": "Dong",
|
||||||
"pa": "ਵੀਅਤਨਾਮੀ ਦੋਙ",
|
"pa": "ਵੀਅਤਨਾਮੀ ਦੋਙ",
|
||||||
@@ -6127,8 +6119,7 @@
|
|||||||
"ro": "Gulden caraibian",
|
"ro": "Gulden caraibian",
|
||||||
"ru": "Карибский гульден",
|
"ru": "Карибский гульден",
|
||||||
"sk": "Karibský gulden",
|
"sk": "Karibský gulden",
|
||||||
"sl": "karibski goldinar",
|
"sl": "karibski goldinar"
|
||||||
"sv": "Karibisk gulden"
|
|
||||||
},
|
},
|
||||||
"XDR": {
|
"XDR": {
|
||||||
"ar": "حقوق السحب الخاصة",
|
"ar": "حقوق السحب الخاصة",
|
||||||
@@ -6156,7 +6147,7 @@
|
|||||||
"oc": "Drechs de tiratge Especials",
|
"oc": "Drechs de tiratge Especials",
|
||||||
"pl": "specjalne prawa ciągnienia",
|
"pl": "specjalne prawa ciągnienia",
|
||||||
"pt": "direitos especiais de saque",
|
"pt": "direitos especiais de saque",
|
||||||
"ro": "drepturi speciale de tragere",
|
"ro": "Drepturi speciale de tragere",
|
||||||
"ru": "специальные права заимствования",
|
"ru": "специальные права заимствования",
|
||||||
"sk": "Zvláštne práva čerpania",
|
"sk": "Zvláštne práva čerpania",
|
||||||
"sl": "posebne pravice črpanja",
|
"sl": "posebne pravice črpanja",
|
||||||
@@ -6234,7 +6225,6 @@
|
|||||||
"ja": "CFPフラン",
|
"ja": "CFPフラン",
|
||||||
"ko": "CFP 프랑",
|
"ko": "CFP 프랑",
|
||||||
"lt": "CFP frankas",
|
"lt": "CFP frankas",
|
||||||
"lv": "Klusā okeāna franks",
|
|
||||||
"ms": "Franc CFP",
|
"ms": "Franc CFP",
|
||||||
"nl": "CFP-frank",
|
"nl": "CFP-frank",
|
||||||
"oc": "Franc CFP",
|
"oc": "Franc CFP",
|
||||||
@@ -6730,8 +6720,6 @@
|
|||||||
"antilliaanse gulden": "ANG",
|
"antilliaanse gulden": "ANG",
|
||||||
"antilski gulden": "ANG",
|
"antilski gulden": "ANG",
|
||||||
"aoa": "AOA",
|
"aoa": "AOA",
|
||||||
"apvienotās karalistes ekonomika": "GBP",
|
|
||||||
"apvienotās karalistes saimniecība": "GBP",
|
|
||||||
"apvienotās karalistes sterliņu mārciņa": "GBP",
|
"apvienotās karalistes sterliņu mārciņa": "GBP",
|
||||||
"ar": "MGA",
|
"ar": "MGA",
|
||||||
"arab accounting dinar": "XAD",
|
"arab accounting dinar": "XAD",
|
||||||
@@ -6844,7 +6832,6 @@
|
|||||||
"avustralya doları": "AUD",
|
"avustralya doları": "AUD",
|
||||||
"awg": "AWG",
|
"awg": "AWG",
|
||||||
"az arany mint befektetés": "XAU",
|
"az arany mint befektetés": "XAU",
|
||||||
"az egyesült királyság gazdasága": "GBP",
|
|
||||||
"azerbaidžanin manat": "AZN",
|
"azerbaidžanin manat": "AZN",
|
||||||
"azerbaidžano manatas": "AZN",
|
"azerbaidžano manatas": "AZN",
|
||||||
"azerbaidžānas manats": "AZN",
|
"azerbaidžānas manats": "AZN",
|
||||||
@@ -7028,7 +7015,6 @@
|
|||||||
"bir etíope": "ETB",
|
"bir etíope": "ETB",
|
||||||
"biras": "ETB",
|
"biras": "ETB",
|
||||||
"birleşik arap emirlikleri dirhemi": "AED",
|
"birleşik arap emirlikleri dirhemi": "AED",
|
||||||
"birleşik krallık ekonomisi": "GBP",
|
|
||||||
"birma kjato": "MMK",
|
"birma kjato": "MMK",
|
||||||
"birr": "ETB",
|
"birr": "ETB",
|
||||||
"birr da etiópia": "ETB",
|
"birr da etiópia": "ETB",
|
||||||
@@ -7069,7 +7055,6 @@
|
|||||||
"bolivjano": "BOB",
|
"bolivjano": "BOB",
|
||||||
"bolivya bolivianosu": "BOB",
|
"bolivya bolivianosu": "BOB",
|
||||||
"bolivya bolivyanosu": "BOB",
|
"bolivya bolivyanosu": "BOB",
|
||||||
"boliwiano": "BOB",
|
|
||||||
"bolívar digital": "VED",
|
"bolívar digital": "VED",
|
||||||
"bolívar soberano": "VES",
|
"bolívar soberano": "VES",
|
||||||
"bolívar sobirà": "VES",
|
"bolívar sobirà": "VES",
|
||||||
@@ -7116,19 +7101,15 @@
|
|||||||
"brit font": "GBP",
|
"brit font": "GBP",
|
||||||
"brita pundo": "GBP",
|
"brita pundo": "GBP",
|
||||||
"britaj pundoj": "GBP",
|
"britaj pundoj": "GBP",
|
||||||
"britannian talous": "GBP",
|
|
||||||
"britanska funta": "GBP",
|
"britanska funta": "GBP",
|
||||||
"britanski funt": "GBP",
|
"britanski funt": "GBP",
|
||||||
"britische wirtschaft": "GBP",
|
|
||||||
"britisches pfund": "GBP",
|
"britisches pfund": "GBP",
|
||||||
"british economy": "GBP",
|
|
||||||
"british pound": "GBP",
|
"british pound": "GBP",
|
||||||
"britisk pund": "GBP",
|
"britisk pund": "GBP",
|
||||||
"britiske pund": "GBP",
|
"britiske pund": "GBP",
|
||||||
"brits pond": "GBP",
|
"brits pond": "GBP",
|
||||||
"britse pond": "GBP",
|
"britse pond": "GBP",
|
||||||
"britská libra": "GBP",
|
"britská libra": "GBP",
|
||||||
"brittisk ekonomi": "GBP",
|
|
||||||
"brittiska pund": "GBP",
|
"brittiska pund": "GBP",
|
||||||
"brittiskt pund": "GBP",
|
"brittiskt pund": "GBP",
|
||||||
"brunei doları": "BND",
|
"brunei doları": "BND",
|
||||||
@@ -7212,7 +7193,6 @@
|
|||||||
"cedi du ghana": "GHS",
|
"cedi du ghana": "GHS",
|
||||||
"cedi ghana": "GHS",
|
"cedi ghana": "GHS",
|
||||||
"cedi ghanese": "GHS",
|
"cedi ghanese": "GHS",
|
||||||
"cedi ghanéen": "GHS",
|
|
||||||
"centr afrika franko": "XAF",
|
"centr afrika franko": "XAF",
|
||||||
"central african cfa franc": "XAF",
|
"central african cfa franc": "XAF",
|
||||||
"centralafrikansk cfa franc": "XAF",
|
"centralafrikansk cfa franc": "XAF",
|
||||||
@@ -7315,6 +7295,7 @@
|
|||||||
"colón costa ricense": "CRC",
|
"colón costa ricense": "CRC",
|
||||||
"colón costa riquenho": "CRC",
|
"colón costa riquenho": "CRC",
|
||||||
"colón costa riquense": "CRC",
|
"colón costa riquense": "CRC",
|
||||||
|
"colón costa riqueny": "CRC",
|
||||||
"colón costaricain": "CRC",
|
"colón costaricain": "CRC",
|
||||||
"colón costaricano": "CRC",
|
"colón costaricano": "CRC",
|
||||||
"colón costaricien": "CRC",
|
"colón costaricien": "CRC",
|
||||||
@@ -8427,7 +8408,6 @@
|
|||||||
"dólares canadenses": "CAD",
|
"dólares canadenses": "CAD",
|
||||||
"dólares estadounidenses": "USD",
|
"dólares estadounidenses": "USD",
|
||||||
"dólares neozelandeses": "NZD",
|
"dólares neozelandeses": "NZD",
|
||||||
"dồng vietnam": "VND",
|
|
||||||
"dram": "AMD",
|
"dram": "AMD",
|
||||||
"dram armean": "AMD",
|
"dram armean": "AMD",
|
||||||
"dram armenia": "AMD",
|
"dram armenia": "AMD",
|
||||||
@@ -8445,13 +8425,11 @@
|
|||||||
"drame arménio": "AMD",
|
"drame arménio": "AMD",
|
||||||
"dramm": "AMD",
|
"dramm": "AMD",
|
||||||
"drechs de tiratge especials": "XDR",
|
"drechs de tiratge especials": "XDR",
|
||||||
"drept special de tragere": "XDR",
|
|
||||||
"drepturi speciale de tragere": "XDR",
|
"drepturi speciale de tragere": "XDR",
|
||||||
"drets especials de gir": "XDR",
|
"drets especials de gir": "XDR",
|
||||||
"droits de tirage speciaux": "XDR",
|
"droits de tirage speciaux": "XDR",
|
||||||
"droits de tirage spéciaux": "XDR",
|
"droits de tirage spéciaux": "XDR",
|
||||||
"dschibuti franc": "DJF",
|
"dschibuti franc": "DJF",
|
||||||
"dvn": "VND",
|
|
||||||
"dzd": "DZD",
|
"dzd": "DZD",
|
||||||
"dzsibuti frank": "DJF",
|
"dzsibuti frank": "DJF",
|
||||||
"džibučio frankas": "DJF",
|
"džibučio frankas": "DJF",
|
||||||
@@ -8465,21 +8443,6 @@
|
|||||||
"eastern caribbean currency union": "XCD",
|
"eastern caribbean currency union": "XCD",
|
||||||
"eastern caribbean dollar": "XCD",
|
"eastern caribbean dollar": "XCD",
|
||||||
"ec$": "XCD",
|
"ec$": "XCD",
|
||||||
"economi'r deyrnas unedig": "GBP",
|
|
||||||
"economia": "GBP",
|
|
||||||
"economia del regne unit": "GBP",
|
|
||||||
"economia del regno unito": "GBP",
|
|
||||||
"economia del reialme unit": "GBP",
|
|
||||||
"economia del reino unido": "GBP",
|
|
||||||
"economia do reino unido": "GBP",
|
|
||||||
"economia regatului unit": "GBP",
|
|
||||||
"economie du royaume uni": "GBP",
|
|
||||||
"economie van het verenigd koninkrijk": "GBP",
|
|
||||||
"economía del reino unido": "GBP",
|
|
||||||
"economía do reino unido": "GBP",
|
|
||||||
"economy": "GBP",
|
|
||||||
"economy of the uk": "GBP",
|
|
||||||
"economy of the united kingdom": "GBP",
|
|
||||||
"egipatska funta": "EGP",
|
"egipatska funta": "EGP",
|
||||||
"egipta pundo": "EGP",
|
"egipta pundo": "EGP",
|
||||||
"egipto svaras": "EGP",
|
"egipto svaras": "EGP",
|
||||||
@@ -8499,12 +8462,6 @@
|
|||||||
"einr": "INR",
|
"einr": "INR",
|
||||||
"eiro": "EUR",
|
"eiro": "EUR",
|
||||||
"ekialdeko karibeko dolar": "XCD",
|
"ekialdeko karibeko dolar": "XCD",
|
||||||
"ekonomi britania raya": "GBP",
|
|
||||||
"ekonomi united kingdom": "GBP",
|
|
||||||
"ekonomie van die verenigde koninkryk": "GBP",
|
|
||||||
"ekonomika spojeného království": "GBP",
|
|
||||||
"ekonomika v spojenom kráľovstve": "GBP",
|
|
||||||
"ekonomio de britujo": "GBP",
|
|
||||||
"el peso": "GTQ",
|
"el peso": "GTQ",
|
||||||
"emalangeni": "SZL",
|
"emalangeni": "SZL",
|
||||||
"emas sebagai pelaburan": "XAU",
|
"emas sebagai pelaburan": "XAU",
|
||||||
@@ -8536,7 +8493,6 @@
|
|||||||
"ermenistan dramı": "AMD",
|
"ermenistan dramı": "AMD",
|
||||||
"ern": "ERN",
|
"ern": "ERN",
|
||||||
"erreal brasildar": "BRL",
|
"erreal brasildar": "BRL",
|
||||||
"erresuma batuko ekonomia": "GBP",
|
|
||||||
"errublo": "RUB",
|
"errublo": "RUB",
|
||||||
"errublo errusiar": "RUB",
|
"errublo errusiar": "RUB",
|
||||||
"errupia indiar": "INR",
|
"errupia indiar": "INR",
|
||||||
@@ -8607,8 +8563,6 @@
|
|||||||
"eyrir": "ISK",
|
"eyrir": "ISK",
|
||||||
"e£": "EGP",
|
"e£": "EGP",
|
||||||
"èuro": "EUR",
|
"èuro": "EUR",
|
||||||
"économie britannique": "GBP",
|
|
||||||
"économie du royaume uni": "GBP",
|
|
||||||
"észak ír font": "GBP",
|
"észak ír font": "GBP",
|
||||||
"észak koreai von": "KPW",
|
"észak koreai von": "KPW",
|
||||||
"e₹": "INR",
|
"e₹": "INR",
|
||||||
@@ -8742,9 +8696,6 @@
|
|||||||
"forintti": "HUF",
|
"forintti": "HUF",
|
||||||
"forinți": "HUF",
|
"forinți": "HUF",
|
||||||
"fòrint": "HUF",
|
"fòrint": "HUF",
|
||||||
"förenade konungariket storbritannien och irlands ekonomi": "GBP",
|
|
||||||
"förenade konungariket storbritannien och nordirlands ekonomi": "GBP",
|
|
||||||
"förenade kungarikets ekonomi": "GBP",
|
|
||||||
"franak cfp": "XPF",
|
"franak cfp": "XPF",
|
||||||
"franc": [
|
"franc": [
|
||||||
"XPF",
|
"XPF",
|
||||||
@@ -8997,9 +8948,6 @@
|
|||||||
"gold als kapitalanlage": "XAU",
|
"gold als kapitalanlage": "XAU",
|
||||||
"gold as an investment": "XAU",
|
"gold as an investment": "XAU",
|
||||||
"gold as currency": "XAU",
|
"gold as currency": "XAU",
|
||||||
"gospodarka wielkiej brytanii": "GBP",
|
|
||||||
"gospodarstvo ujedinjenog kraljevstva": "GBP",
|
|
||||||
"gospodarstvo združenega kraljestva": "GBP",
|
|
||||||
"gourde": "HTG",
|
"gourde": "HTG",
|
||||||
"gourde haiti": "HTG",
|
"gourde haiti": "HTG",
|
||||||
"gourde haitiano": "HTG",
|
"gourde haitiano": "HTG",
|
||||||
@@ -9419,7 +9367,6 @@
|
|||||||
"juaņs": "CNY",
|
"juaņs": "CNY",
|
||||||
"juhokoréjsky won": "KRW",
|
"juhokoréjsky won": "KRW",
|
||||||
"juhosudánska libra": "SSP",
|
"juhosudánska libra": "SSP",
|
||||||
"jungtinės karalystės ekonomika": "GBP",
|
|
||||||
"jungtinių arabų emyratų dirhamas": "AED",
|
"jungtinių arabų emyratų dirhamas": "AED",
|
||||||
"jungtinių valstijų doleris": "USD",
|
"jungtinių valstijų doleris": "USD",
|
||||||
"južnoafrički rand": "ZAR",
|
"južnoafrički rand": "ZAR",
|
||||||
@@ -9484,7 +9431,6 @@
|
|||||||
"karibi forint": "XCG",
|
"karibi forint": "XCG",
|
||||||
"karibia guldeno": "XCG",
|
"karibia guldeno": "XCG",
|
||||||
"karibischer gulden": "XCG",
|
"karibischer gulden": "XCG",
|
||||||
"karibisk gulden": "XCG",
|
|
||||||
"karibski goldinar": "XCG",
|
"karibski goldinar": "XCG",
|
||||||
"karibský gulden": "XCG",
|
"karibský gulden": "XCG",
|
||||||
"karipski gulden": "XCG",
|
"karipski gulden": "XCG",
|
||||||
@@ -9545,9 +9491,6 @@
|
|||||||
"kina papua nugini": "PGK",
|
"kina papua nugini": "PGK",
|
||||||
"kina papuana": "PGK",
|
"kina papuana": "PGK",
|
||||||
"kina papuásia": "PGK",
|
"kina papuásia": "PGK",
|
||||||
"kinh tế anh": "GBP",
|
|
||||||
"kinh tế vương quốc anh": "GBP",
|
|
||||||
"kinh tế vương quốc liên hiệp anh và bắc ireland": "GBP",
|
|
||||||
"kip": "LAK",
|
"kip": "LAK",
|
||||||
"kip laos": "LAK",
|
"kip laos": "LAK",
|
||||||
"kip laosiano": "LAK",
|
"kip laosiano": "LAK",
|
||||||
@@ -9575,8 +9518,6 @@
|
|||||||
"kíp lào": "LAK",
|
"kíp lào": "LAK",
|
||||||
"kīp": "LAK",
|
"kīp": "LAK",
|
||||||
"kjat": "MMK",
|
"kjat": "MMK",
|
||||||
"kjats": "MMK",
|
|
||||||
"klusā okeāna franks": "XPF",
|
|
||||||
"km": "BAM",
|
"km": "BAM",
|
||||||
"kmf": "KMF",
|
"kmf": "KMF",
|
||||||
"koeweitse dinar": "KWD",
|
"koeweitse dinar": "KWD",
|
||||||
@@ -10082,7 +10023,6 @@
|
|||||||
"lire sterline": "GBP",
|
"lire sterline": "GBP",
|
||||||
"lire turque": "TRY",
|
"lire turque": "TRY",
|
||||||
"lisente": "LSL",
|
"lisente": "LSL",
|
||||||
"list of syrian coins": "SYP",
|
|
||||||
"liura de gibartar": "GIP",
|
"liura de gibartar": "GIP",
|
||||||
"liura egipciana": "EGP",
|
"liura egipciana": "EGP",
|
||||||
"liura esterlina": "GBP",
|
"liura esterlina": "GBP",
|
||||||
@@ -11192,7 +11132,6 @@
|
|||||||
"põhja korea won": "KPW",
|
"põhja korea won": "KPW",
|
||||||
"põhja makedoonia denaar": "MKD",
|
"põhja makedoonia denaar": "MKD",
|
||||||
"prata como investimento": "XAG",
|
"prata como investimento": "XAG",
|
||||||
"produits agricole de l'angleterre": "GBP",
|
|
||||||
"pula": "BWP",
|
"pula": "BWP",
|
||||||
"pula botswana": "BWP",
|
"pula botswana": "BWP",
|
||||||
"pula botswanais": "BWP",
|
"pula botswanais": "BWP",
|
||||||
@@ -11243,7 +11182,6 @@
|
|||||||
"qatarisk rial": "QAR",
|
"qatarisk rial": "QAR",
|
||||||
"qäpik": "AZN",
|
"qäpik": "AZN",
|
||||||
"qindarka": "ALL",
|
"qindarka": "ALL",
|
||||||
"quanza": "AOA",
|
|
||||||
"quetzal": "GTQ",
|
"quetzal": "GTQ",
|
||||||
"quetzal guatemala": "GTQ",
|
"quetzal guatemala": "GTQ",
|
||||||
"quetzal guatemalteco": "GTQ",
|
"quetzal guatemalteco": "GTQ",
|
||||||
@@ -11375,6 +11313,7 @@
|
|||||||
"riel camboxano": "KHR",
|
"riel camboxano": "KHR",
|
||||||
"riel camboyano": "KHR",
|
"riel camboyano": "KHR",
|
||||||
"riel campuchia": "KHR",
|
"riel campuchia": "KHR",
|
||||||
|
"riel kambodżański": "KHR",
|
||||||
"riel kamboja": "KHR",
|
"riel kamboja": "KHR",
|
||||||
"riel na cambóide": "KHR",
|
"riel na cambóide": "KHR",
|
||||||
"rietumāfrikas franks": "XOF",
|
"rietumāfrikas franks": "XOF",
|
||||||
@@ -11569,7 +11508,6 @@
|
|||||||
"rupia del pakistan": "PKR",
|
"rupia del pakistan": "PKR",
|
||||||
"rupia dell'india": "INR",
|
"rupia dell'india": "INR",
|
||||||
"rupia delle seychelles": "SCR",
|
"rupia delle seychelles": "SCR",
|
||||||
"rupia din seychelles": "SCR",
|
|
||||||
"rupia do nepal": "NPR",
|
"rupia do nepal": "NPR",
|
||||||
"rupia do paquistão": "PKR",
|
"rupia do paquistão": "PKR",
|
||||||
"rupia do seri lanca": "LKR",
|
"rupia do seri lanca": "LKR",
|
||||||
@@ -11625,7 +11563,6 @@
|
|||||||
],
|
],
|
||||||
"rupie indiană": "INR",
|
"rupie indiană": "INR",
|
||||||
"rupie indiane": "INR",
|
"rupie indiane": "INR",
|
||||||
"rupie seychelloză": "SCR",
|
|
||||||
"rupies índies": "INR",
|
"rupies índies": "INR",
|
||||||
"rupija": [
|
"rupija": [
|
||||||
"NPR",
|
"NPR",
|
||||||
@@ -12055,10 +11992,6 @@
|
|||||||
"sterliņu mārciņa": "GBP",
|
"sterliņu mārciņa": "GBP",
|
||||||
"stērliņu mārciņa": "GBP",
|
"stērliņu mārciņa": "GBP",
|
||||||
"stn": "STN",
|
"stn": "STN",
|
||||||
"storbritannien och irlands ekonomi": "GBP",
|
|
||||||
"storbritannien och nordirlands ekonomi": "GBP",
|
|
||||||
"storbritanniens ekonomi": "GBP",
|
|
||||||
"storbritanniens økonomi": "GBP",
|
|
||||||
"stredoafrický frank": "XAF",
|
"stredoafrický frank": "XAF",
|
||||||
"středoafrický frank": "XAF",
|
"středoafrický frank": "XAF",
|
||||||
"sucre": "XSU",
|
"sucre": "XSU",
|
||||||
@@ -12108,7 +12041,6 @@
|
|||||||
"suriye lirası": "SYP",
|
"suriye lirası": "SYP",
|
||||||
"suudi arabistan riyali": "SAR",
|
"suudi arabistan riyali": "SAR",
|
||||||
"suudi riyali": "SAR",
|
"suudi riyali": "SAR",
|
||||||
"suurbritannia majandus": "GBP",
|
|
||||||
"suurbritannia nael": "GBP",
|
"suurbritannia nael": "GBP",
|
||||||
"suurbritannia naelsterling": "GBP",
|
"suurbritannia naelsterling": "GBP",
|
||||||
"suvereni bolivar": "VES",
|
"suvereni bolivar": "VES",
|
||||||
@@ -12215,7 +12147,6 @@
|
|||||||
"švicarski frank": "CHF",
|
"švicarski frank": "CHF",
|
||||||
"švýcarský frank": "CHF",
|
"švýcarský frank": "CHF",
|
||||||
"șekel nou": "ILS",
|
"șekel nou": "ILS",
|
||||||
"șiling somalez": "SOS",
|
|
||||||
"şekel": "ILS",
|
"şekel": "ILS",
|
||||||
"şili pesosu": "CLP",
|
"şili pesosu": "CLP",
|
||||||
"s₣": "CHF",
|
"s₣": "CHF",
|
||||||
@@ -12326,7 +12257,6 @@
|
|||||||
"thaise baht": "THB",
|
"thaise baht": "THB",
|
||||||
"thajský baht": "THB",
|
"thajský baht": "THB",
|
||||||
"thb": "THB",
|
"thb": "THB",
|
||||||
"the australian dollar": "AUD",
|
|
||||||
"thebe": "BWP",
|
"thebe": "BWP",
|
||||||
"third belarusian ruble": "BYN",
|
"third belarusian ruble": "BYN",
|
||||||
"tical": "THB",
|
"tical": "THB",
|
||||||
@@ -12558,8 +12488,6 @@
|
|||||||
"uguiya": "MRU",
|
"uguiya": "MRU",
|
||||||
"ugx": "UGX",
|
"ugx": "UGX",
|
||||||
"ui": "UYI",
|
"ui": "UYI",
|
||||||
"uk economy": "GBP",
|
|
||||||
"uk's economy": "GBP",
|
|
||||||
"ukl": "GBP",
|
"ukl": "GBP",
|
||||||
"ukraina grivna": "UAH",
|
"ukraina grivna": "UAH",
|
||||||
"ukraina hrivno": "UAH",
|
"ukraina hrivno": "UAH",
|
||||||
@@ -12600,8 +12528,6 @@
|
|||||||
"unidades de inversion": "MXV",
|
"unidades de inversion": "MXV",
|
||||||
"unidades de inversión": "MXV",
|
"unidades de inversión": "MXV",
|
||||||
"united arab emirates dirham": "AED",
|
"united arab emirates dirham": "AED",
|
||||||
"united kingdom economy": "GBP",
|
|
||||||
"united kingdom's economy": "GBP",
|
|
||||||
"united states dollar": [
|
"united states dollar": [
|
||||||
"USN",
|
"USN",
|
||||||
"USD"
|
"USD"
|
||||||
@@ -12703,7 +12629,6 @@
|
|||||||
"venemaa rubla": "RUB",
|
"venemaa rubla": "RUB",
|
||||||
"venezuelai bolívar": "VES",
|
"venezuelai bolívar": "VES",
|
||||||
"venezuelan digital bolívar": "VED",
|
"venezuelan digital bolívar": "VED",
|
||||||
"verenigd koninkrijk economie": "GBP",
|
|
||||||
"verenigde arabiese emirate dirham": "AED",
|
"verenigde arabiese emirate dirham": "AED",
|
||||||
"verenigde arabische emiraten dirham": "AED",
|
"verenigde arabische emiraten dirham": "AED",
|
||||||
"ves": "VES",
|
"ves": "VES",
|
||||||
@@ -12735,12 +12660,6 @@
|
|||||||
"wir euro": "CHE",
|
"wir euro": "CHE",
|
||||||
"wir franc": "CHW",
|
"wir franc": "CHW",
|
||||||
"wir franken": "CHW",
|
"wir franken": "CHW",
|
||||||
"wirtschaft": "GBP",
|
|
||||||
"wirtschaft des vereinigten königreichs": "GBP",
|
|
||||||
"wirtschaft im vereinigten königreich": "GBP",
|
|
||||||
"wirtschaft in dem vereinigten königreich": "GBP",
|
|
||||||
"wirtschaft vom vereinigten königreich": "GBP",
|
|
||||||
"wirtschaft von dem vereinigten königreich": "GBP",
|
|
||||||
"wit russische roebel": "BYN",
|
"wit russische roebel": "BYN",
|
||||||
"won": "KRW",
|
"won": "KRW",
|
||||||
"won bắc triều tiên": "KPW",
|
"won bắc triều tiên": "KPW",
|
||||||
@@ -12821,7 +12740,6 @@
|
|||||||
"yen": "JPY",
|
"yen": "JPY",
|
||||||
"yen giapponese": "JPY",
|
"yen giapponese": "JPY",
|
||||||
"yen japones": "JPY",
|
"yen japones": "JPY",
|
||||||
"yen japonez": "JPY",
|
|
||||||
"yen japonés": "JPY",
|
"yen japonés": "JPY",
|
||||||
"yeni": "JPY",
|
"yeni": "JPY",
|
||||||
"yeni i̇srail şekeli": "ILS",
|
"yeni i̇srail şekeli": "ILS",
|
||||||
@@ -12834,7 +12752,6 @@
|
|||||||
"yeşil burun adaları eskudosu": "CVE",
|
"yeşil burun adaları eskudosu": "CVE",
|
||||||
"yên nhật": "JPY",
|
"yên nhật": "JPY",
|
||||||
"yhdistyneen kuningaskunnan punta": "GBP",
|
"yhdistyneen kuningaskunnan punta": "GBP",
|
||||||
"yhdistyneen kuningaskunnan talous": "GBP",
|
|
||||||
"yhdistyneiden arabiemiraattien dirhami": "AED",
|
"yhdistyneiden arabiemiraattien dirhami": "AED",
|
||||||
"yhdysvaltain dollari": "USD",
|
"yhdysvaltain dollari": "USD",
|
||||||
"ytl": "TRY",
|
"ytl": "TRY",
|
||||||
@@ -12889,6 +12806,7 @@
|
|||||||
"zimbabwe zig": "ZWG",
|
"zimbabwe zig": "ZWG",
|
||||||
"zimbabwean dollar": "ZWL",
|
"zimbabwean dollar": "ZWL",
|
||||||
"zimbabwean gold": "ZWG",
|
"zimbabwean gold": "ZWG",
|
||||||
|
"zimbabwean zig": "ZWG",
|
||||||
"zimbabwen kulta": "ZWG",
|
"zimbabwen kulta": "ZWG",
|
||||||
"zimbabwiansky zlatý": "ZWG",
|
"zimbabwiansky zlatý": "ZWG",
|
||||||
"zimbabwský dolar": "ZWL",
|
"zimbabwský dolar": "ZWL",
|
||||||
@@ -13047,7 +12965,6 @@
|
|||||||
"FKP",
|
"FKP",
|
||||||
"EGP"
|
"EGP"
|
||||||
],
|
],
|
||||||
"£S": "SYP",
|
|
||||||
"£e": "EGP",
|
"£e": "EGP",
|
||||||
"£s": "SYP",
|
"£s": "SYP",
|
||||||
"¥": [
|
"¥": [
|
||||||
@@ -13584,8 +13501,6 @@
|
|||||||
"египетский фунт": "EGP",
|
"египетский фунт": "EGP",
|
||||||
"единая система региональных взаиморасчётов": "XSU",
|
"единая система региональных взаиморасчётов": "XSU",
|
||||||
"единая система региональных взаиморасчетов": "XSU",
|
"единая система региональных взаиморасчетов": "XSU",
|
||||||
"економіка великобританії": "GBP",
|
|
||||||
"економіка великої британії": "GBP",
|
|
||||||
"енглеска фунта": "GBP",
|
"енглеска фунта": "GBP",
|
||||||
"еритрейська накфа": "ERN",
|
"еритрейська накфа": "ERN",
|
||||||
"еритрејска накфа": "ERN",
|
"еритрејска накфа": "ERN",
|
||||||
@@ -13642,8 +13557,6 @@
|
|||||||
"израелски шекел": "ILS",
|
"израелски шекел": "ILS",
|
||||||
"израильский новый шекель": "ILS",
|
"израильский новый шекель": "ILS",
|
||||||
"източнокарибски долар": "XCD",
|
"източнокарибски долар": "XCD",
|
||||||
"икономика на великобритания": "GBP",
|
|
||||||
"икономика на обединеното кралство": "GBP",
|
|
||||||
"индийска рупия": "INR",
|
"индийска рупия": "INR",
|
||||||
"индийская рупия": "INR",
|
"индийская рупия": "INR",
|
||||||
"индијска рупија": "INR",
|
"индијска рупија": "INR",
|
||||||
@@ -14057,7 +13970,6 @@
|
|||||||
"PLZ",
|
"PLZ",
|
||||||
"PLN"
|
"PLN"
|
||||||
],
|
],
|
||||||
"привреда уједињеног краљевства": "GBP",
|
|
||||||
"пула": "BWP",
|
"пула": "BWP",
|
||||||
"південно африканський ранд": "ZAR",
|
"південно африканський ранд": "ZAR",
|
||||||
"південнокорейська вона": "KRW",
|
"південнокорейська вона": "KRW",
|
||||||
@@ -14145,7 +14057,6 @@
|
|||||||
"севернокорејски вон": "KPW",
|
"севернокорејски вон": "KPW",
|
||||||
"северо корейская вона": "KPW",
|
"северо корейская вона": "KPW",
|
||||||
"северокорейская вона": "KPW",
|
"северокорейская вона": "KPW",
|
||||||
"седі": "GHS",
|
|
||||||
"сейшел рупиясе": "SCR",
|
"сейшел рупиясе": "SCR",
|
||||||
"сейшелска рупия": "SCR",
|
"сейшелска рупия": "SCR",
|
||||||
"сейшельская рупия": "SCR",
|
"сейшельская рупия": "SCR",
|
||||||
@@ -14198,8 +14109,6 @@
|
|||||||
"старый румынский лей": "RON",
|
"старый румынский лей": "RON",
|
||||||
"стерлинг фунты": "GBP",
|
"стерлинг фунты": "GBP",
|
||||||
"стерлиң фунты": "GBP",
|
"стерлиң фунты": "GBP",
|
||||||
"стопанство на великобритания": "GBP",
|
|
||||||
"стопанство на обединеното кралство": "GBP",
|
|
||||||
"суверен боливар": "VES",
|
"суверен боливар": "VES",
|
||||||
"суверенний болівар": "VES",
|
"суверенний болівар": "VES",
|
||||||
"суверенный боливар": "VES",
|
"суверенный боливар": "VES",
|
||||||
@@ -14450,7 +14359,6 @@
|
|||||||
"шриланкийска рупия": "LKR",
|
"шриланкийска рупия": "LKR",
|
||||||
"шриланчанска рупија": "LKR",
|
"шриланчанска рупија": "LKR",
|
||||||
"щатски долар": "USD",
|
"щатски долар": "USD",
|
||||||
"экономика великобритании": "GBP",
|
|
||||||
"эритрейская накфа": "ERN",
|
"эритрейская накфа": "ERN",
|
||||||
"эритрея накфасы": "ERN",
|
"эритрея накфасы": "ERN",
|
||||||
"эсватини лилангение": "SZL",
|
"эсватини лилангение": "SZL",
|
||||||
@@ -14600,8 +14508,6 @@
|
|||||||
"יואן סיני": "CNY",
|
"יואן סיני": "CNY",
|
||||||
"ין יפני": "JPY",
|
"ין יפני": "JPY",
|
||||||
"כארתולי לארי": "GEL",
|
"כארתולי לארי": "GEL",
|
||||||
"כלכלת בריטניה": "GBP",
|
|
||||||
"כלכלת הממלכה המאוחדת": "GBP",
|
|
||||||
"כתר דני": "DKK",
|
"כתר דני": "DKK",
|
||||||
"כתר נורבגי": "NOK",
|
"כתר נורבגי": "NOK",
|
||||||
"כתר נורווגי": "NOK",
|
"כתר נורווגי": "NOK",
|
||||||
@@ -14749,7 +14655,6 @@
|
|||||||
"استثمار البلاتين": "XPT",
|
"استثمار البلاتين": "XPT",
|
||||||
"استثمار الذهب": "XAU",
|
"استثمار الذهب": "XAU",
|
||||||
"استثمار الفضة": "XAG",
|
"استثمار الفضة": "XAG",
|
||||||
"اقتصاد المملكة المتحدة": "GBP",
|
|
||||||
"الاستثمار في الذهب": "XAU",
|
"الاستثمار في الذهب": "XAU",
|
||||||
"الأوقية الموريتانية": "MRU",
|
"الأوقية الموريتانية": "MRU",
|
||||||
"البات": "THB",
|
"البات": "THB",
|
||||||
@@ -14803,7 +14708,6 @@
|
|||||||
"أوقية": "MRU",
|
"أوقية": "MRU",
|
||||||
"أوقية موريتانية": "MRU",
|
"أوقية موريتانية": "MRU",
|
||||||
"أوقيه موريتانيه": "MRU",
|
"أوقيه موريتانيه": "MRU",
|
||||||
"إقتصاد بريطانى": "GBP",
|
|
||||||
"إيسكودو جزر الرأس الأخضر": "CVE",
|
"إيسكودو جزر الرأس الأخضر": "CVE",
|
||||||
"بات": "THB",
|
"بات": "THB",
|
||||||
"بات تايلاندي": "THB",
|
"بات تايلاندي": "THB",
|
||||||
@@ -15055,8 +14959,6 @@
|
|||||||
"فورنت مجري": "HUF",
|
"فورنت مجري": "HUF",
|
||||||
"فورينت مجري": "HUF",
|
"فورينت مجري": "HUF",
|
||||||
"فِرَنْكٌ رُوَنْدِيٌّ": "RWF",
|
"فِرَنْكٌ رُوَنْدِيٌّ": "RWF",
|
||||||
"قائمة النقود المعدنية السورية": "SYP",
|
|
||||||
"قائمة عملات سوريا المعدنية": "SYP",
|
|
||||||
"ك": "KWD",
|
"ك": "KWD",
|
||||||
"كتزال غواتيمالي": "GTQ",
|
"كتزال غواتيمالي": "GTQ",
|
||||||
"كرونة آيسلندية": "ISK",
|
"كرونة آيسلندية": "ISK",
|
||||||
@@ -15186,7 +15088,6 @@
|
|||||||
"মালদ্বীপীয় রুফিয়াহ": "MVR",
|
"মালদ্বীপীয় রুফিয়াহ": "MVR",
|
||||||
"মিয়ানমার ক্যত": "MMK",
|
"মিয়ানমার ক্যত": "MMK",
|
||||||
"মিশরীয় পাউন্ড": "EGP",
|
"মিশরীয় পাউন্ড": "EGP",
|
||||||
"যুক্তরাজ্যের অর্থনীতি": "GBP",
|
|
||||||
"রুশ রুবল": "RUB",
|
"রুশ রুবল": "RUB",
|
||||||
"রেনমিনবি": "CNY",
|
"রেনমিনবি": "CNY",
|
||||||
"রেন্মিন্বি": "CNY",
|
"রেন্মিন্বি": "CNY",
|
||||||
@@ -15818,7 +15719,6 @@
|
|||||||
"엔": "JPY",
|
"엔": "JPY",
|
||||||
"엔화": "JPY",
|
"엔화": "JPY",
|
||||||
"영국 파운드": "GBP",
|
"영국 파운드": "GBP",
|
||||||
"영국의 경제": "GBP",
|
|
||||||
"예멘 리알": "YER",
|
"예멘 리알": "YER",
|
||||||
"예멘 리얄": "YER",
|
"예멘 리얄": "YER",
|
||||||
"예멘리얄": "YER",
|
"예멘리얄": "YER",
|
||||||
@@ -16026,11 +15926,9 @@
|
|||||||
"イエメン・リアル": "YER",
|
"イエメン・リアル": "YER",
|
||||||
"イエメン・リヤル": "YER",
|
"イエメン・リヤル": "YER",
|
||||||
"イエメン・リヤール": "YER",
|
"イエメン・リヤール": "YER",
|
||||||
"イギリスの経済": "GBP",
|
|
||||||
"イギリスの通貨": "GBP",
|
"イギリスの通貨": "GBP",
|
||||||
"イギリスポンド": "GBP",
|
"イギリスポンド": "GBP",
|
||||||
"イギリス・ポンド": "GBP",
|
"イギリス・ポンド": "GBP",
|
||||||
"イギリス経済": "GBP",
|
|
||||||
"イラクの通貨": "IQD",
|
"イラクの通貨": "IQD",
|
||||||
"イラク・ディナール": "IQD",
|
"イラク・ディナール": "IQD",
|
||||||
"イランの通貨": "IRR",
|
"イランの通貨": "IRR",
|
||||||
@@ -16332,7 +16230,6 @@
|
|||||||
"英ポンド": "GBP",
|
"英ポンド": "GBP",
|
||||||
"西アフリカcfaフラン": "XOF",
|
"西アフリカcfaフラン": "XOF",
|
||||||
"豪ドル": "AUD",
|
"豪ドル": "AUD",
|
||||||
"財政・経済政策": "GBP",
|
|
||||||
"越南銅": "VND",
|
"越南銅": "VND",
|
||||||
"金投資": "XAU",
|
"金投資": "XAU",
|
||||||
"韓国ウォン": "KRW",
|
"韓国ウォン": "KRW",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
4502
searx/data/gsa_useragents.txt
Normal file
4502
searx/data/gsa_useragents.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,7 @@
|
|||||||
],
|
],
|
||||||
"ua": "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}",
|
"ua": "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}",
|
||||||
"versions": [
|
"versions": [
|
||||||
"153.0",
|
"151.0",
|
||||||
"152.0"
|
"150.0"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -3272,7 +3272,7 @@
|
|||||||
"Q128822": {
|
"Q128822": {
|
||||||
"si_name": "Q182429",
|
"si_name": "Q182429",
|
||||||
"symbol": "kn",
|
"symbol": "kn",
|
||||||
"to_si_factor": 0.514
|
"to_si_factor": 0.5144444444444445
|
||||||
},
|
},
|
||||||
"Q12912288": {
|
"Q12912288": {
|
||||||
"si_name": null,
|
"si_name": null,
|
||||||
@@ -3521,7 +3521,7 @@
|
|||||||
},
|
},
|
||||||
"Q1377741": {
|
"Q1377741": {
|
||||||
"si_name": "Q25250",
|
"si_name": "Q25250",
|
||||||
"symbol": "V<sub>P</sub>",
|
"symbol": "V_P",
|
||||||
"to_si_factor": 1.0429e+27
|
"to_si_factor": 1.0429e+27
|
||||||
},
|
},
|
||||||
"Q1386162": {
|
"Q1386162": {
|
||||||
@@ -3694,11 +3694,6 @@
|
|||||||
"symbol": "apc",
|
"symbol": "apc",
|
||||||
"to_si_factor": 0.0308568
|
"to_si_factor": 0.0308568
|
||||||
},
|
},
|
||||||
"Q16068": {
|
|
||||||
"si_name": null,
|
|
||||||
"symbol": "DM",
|
|
||||||
"to_si_factor": null
|
|
||||||
},
|
|
||||||
"Q160857": {
|
"Q160857": {
|
||||||
"si_name": "Q25236",
|
"si_name": "Q25236",
|
||||||
"symbol": "hp",
|
"symbol": "hp",
|
||||||
@@ -3877,11 +3872,11 @@
|
|||||||
"Q180892": {
|
"Q180892": {
|
||||||
"si_name": "Q11570",
|
"si_name": "Q11570",
|
||||||
"symbol": "M☉",
|
"symbol": "M☉",
|
||||||
"to_si_factor": 1.988416e+30
|
"to_si_factor": 1.9884e+30
|
||||||
},
|
},
|
||||||
"Q1811": {
|
"Q1811": {
|
||||||
"si_name": "Q11573",
|
"si_name": "Q11573",
|
||||||
"symbol": "au",
|
"symbol": "AU",
|
||||||
"to_si_factor": 149597870700.0
|
"to_si_factor": 149597870700.0
|
||||||
},
|
},
|
||||||
"Q1815100": {
|
"Q1815100": {
|
||||||
@@ -4459,11 +4454,6 @@
|
|||||||
"symbol": "ng",
|
"symbol": "ng",
|
||||||
"to_si_factor": 1e-12
|
"to_si_factor": 1e-12
|
||||||
},
|
},
|
||||||
"Q2285395": {
|
|
||||||
"si_name": null,
|
|
||||||
"symbol": "dBW",
|
|
||||||
"to_si_factor": null
|
|
||||||
},
|
|
||||||
"Q22934083": {
|
"Q22934083": {
|
||||||
"si_name": "Q25406",
|
"si_name": "Q25406",
|
||||||
"symbol": "nC",
|
"symbol": "nC",
|
||||||
@@ -6326,7 +6316,7 @@
|
|||||||
},
|
},
|
||||||
"Q536785": {
|
"Q536785": {
|
||||||
"si_name": "Q844211",
|
"si_name": "Q844211",
|
||||||
"symbol": "ρ<sub>P</sub>",
|
"symbol": "ρ_P",
|
||||||
"to_si_factor": 5.155e+96
|
"to_si_factor": 5.155e+96
|
||||||
},
|
},
|
||||||
"Q53679433": {
|
"Q53679433": {
|
||||||
@@ -6981,7 +6971,7 @@
|
|||||||
},
|
},
|
||||||
"Q685662": {
|
"Q685662": {
|
||||||
"si_name": "Q44395",
|
"si_name": "Q44395",
|
||||||
"symbol": "p<sub>P</sub>",
|
"symbol": "p_P",
|
||||||
"to_si_factor": 4.633e+113
|
"to_si_factor": 4.633e+113
|
||||||
},
|
},
|
||||||
"Q686163": {
|
"Q686163": {
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ ENGINES_CACHE: ExpireCacheSQLite = ExpireCacheSQLite.build_cache(
|
|||||||
ExpireCacheCfg(
|
ExpireCacheCfg(
|
||||||
name="ENGINES_CACHE",
|
name="ENGINES_CACHE",
|
||||||
MAXHOLD_TIME=60 * 60 * 24 * 7, # 7 days
|
MAXHOLD_TIME=60 * 60 * 24 * 7, # 7 days
|
||||||
MAINTENANCE_PERIOD=60 * 60, # 1h
|
MAINTENANCE_PERIOD=60 * 60, # 2h
|
||||||
MAX_VALUE_LEN=1024 * 1024 * 1024, # 1MB
|
MAX_VALUE_LEN=1024 * 1024 * 1024, # 1MB
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -361,43 +361,37 @@ class Engine(abc.ABC): # pylint: disable=too-few-public-methods
|
|||||||
https: socks5://proxy:port
|
https: socks5://proxy:port
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def setup(self, engine_settings: dict[str, t.Any]) -> bool | None: # pylint: disable=unused-argument
|
def setup(self, engine_settings: dict[str, t.Any]) -> bool: # pylint: disable=unused-argument
|
||||||
"""Dynamic setup of the engine settings.
|
"""Dynamic setup of the engine settings.
|
||||||
|
|
||||||
With this method, the engine's setup is carried out. For example, to
|
With this method, the engine's setup is carried out. For example, to
|
||||||
check or dynamically adapt the values handed over in the parameter
|
check or dynamically adapt the values handed over in the parameter
|
||||||
``engine_settings``.
|
``engine_settings``. The return value (True/False) indicates whether
|
||||||
|
the setup was successful and the engine can be built or rejected.
|
||||||
|
|
||||||
Whether the initialization was successful can be indicated by the return
|
The method is optional and is called synchronously as part of the
|
||||||
value ``True`` or even ``False``.
|
|
||||||
|
|
||||||
- If no return value (``None`` ) is given from this method , this is
|
|
||||||
equivalent to ``True``.
|
|
||||||
|
|
||||||
- If an exception is thrown as part of the initialization, this is
|
|
||||||
equivalent to ``False``.
|
|
||||||
|
|
||||||
The method is optional and is called **synchronously** as part of the
|
|
||||||
initialization of the service and is therefore only suitable for simple
|
initialization of the service and is therefore only suitable for simple
|
||||||
(local) exams/changes at the engine setting.
|
(local) exams/changes at the engine setting. The :py:obj:`Engine.init`
|
||||||
|
method must be used for longer tasks in which values of a remote must be
|
||||||
The :py:obj:`Engine.init` method must be used for longer tasks in which
|
determined, for example.
|
||||||
values of a remote must be determined, for example.
|
|
||||||
"""
|
"""
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def init(self, engine_settings: dict[str, t.Any]) -> bool | None: # pylint: disable=unused-argument
|
def init(self, engine_settings: dict[str, t.Any]) -> bool | None: # pylint: disable=unused-argument
|
||||||
"""Initialization of the engine.
|
"""Initialization of the engine.
|
||||||
|
|
||||||
The method is optional and called **asynchronous** (in a thread). The
|
The method is optional and asynchronous (in a thread). It is suitable,
|
||||||
method is comparable to :py:obj:`Engine.setup`, it is suitable, for
|
for example, for setting up a cache (for the engine) or for querying
|
||||||
caching data that first needs to be requested from a remote.
|
values (required by the engine) from a remote.
|
||||||
|
|
||||||
The method is optional and runs **asynchronously** (in a thread), it is
|
Whether the initialization was successful can be indicated by the return
|
||||||
comparable to :py:obj:`Engine.setup`. For instance, it is suitable for
|
value ``True`` or even ``False``.
|
||||||
caching data that first needs to be requested from a remote source.
|
|
||||||
|
|
||||||
The evaluation of the return value is analogous to :py:obj:`Engine.setup`.
|
- If no return value is given from this init method (``None``), this is
|
||||||
|
equivalent to ``True``.
|
||||||
|
|
||||||
|
- If an exception is thrown as part of the initialization, this is
|
||||||
|
equivalent to ``False``.
|
||||||
"""
|
"""
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ fragment SXNG_query on Query {
|
|||||||
|
|
||||||
def setup(_) -> bool:
|
def setup(_) -> bool:
|
||||||
global SXNG_query # pylint: disable=global-statement
|
global SXNG_query # pylint: disable=global-statement
|
||||||
rand_str: str = "".join(random.choices(string.ascii_letters, k=5))
|
rand_str: str = "".join(random.choice(string.ascii_letters) for _ in range(5))
|
||||||
SXNG_query = SXNG_query.replace("SXNG_query", "PhotoSearchPaginationContainer_query_1" + rand_str)
|
SXNG_query = SXNG_query.replace("SXNG_query", "PhotoSearchPaginationContainer_query_1" + rand_str)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|||||||
@@ -269,27 +269,21 @@ def is_engine_active(engine: "Engine | types.ModuleType"):
|
|||||||
|
|
||||||
|
|
||||||
def call_engine_setup(engine: "Engine | types.ModuleType", engine_data: dict[str, t.Any]) -> bool:
|
def call_engine_setup(engine: "Engine | types.ModuleType", engine_data: dict[str, t.Any]) -> bool:
|
||||||
|
setup_ok = False
|
||||||
setup_ok: bool | None = False
|
|
||||||
setup_func = getattr(engine, "setup", None)
|
setup_func = getattr(engine, "setup", None)
|
||||||
|
|
||||||
if setup_func is None:
|
if setup_func is None:
|
||||||
setup_ok = True
|
setup_ok = True
|
||||||
elif not callable(setup_func):
|
elif not callable(setup_func):
|
||||||
logger.error(f"engine's setup method isn't a callable (is of type: {type(setup_func)})")
|
logger.error("engine's setup method isn't a callable (is of type: %s)", type(setup_func))
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
setup_ok = engine.setup(engine_data)
|
setup_ok = engine.setup(engine_data)
|
||||||
except Exception as e: # pylint: disable=broad-except
|
except Exception as e: # pylint: disable=broad-except
|
||||||
logger.exception(f"(PID {os.getpid()}) {engine.name}: engine SETUP failed, exception: {e}")
|
logger.exception('exception : {0}'.format(e))
|
||||||
setup_ok = False
|
|
||||||
|
|
||||||
# The evaluation of the return value is analogous to Engine.init
|
|
||||||
if setup_ok is None:
|
|
||||||
setup_ok = True
|
|
||||||
|
|
||||||
if not setup_ok:
|
if not setup_ok:
|
||||||
logger.error(f"(PID {os.getpid()}) {engine.name}: engine setup was not successful")
|
logger.error("%s: Engine setup was not successful, engine is set to inactive.", engine.name)
|
||||||
return setup_ok
|
return setup_ok
|
||||||
|
|
||||||
|
|
||||||
@@ -317,16 +311,14 @@ def load_engines(engine_list: list[dict[str, t.Any]]):
|
|||||||
for engine_data in engine_list:
|
for engine_data in engine_list:
|
||||||
if engine_data.get("inactive") is True:
|
if engine_data.get("inactive") is True:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
engine = load_engine(engine_data)
|
engine = load_engine(engine_data)
|
||||||
|
|
||||||
if engine:
|
if engine:
|
||||||
register_engine(engine)
|
register_engine(engine)
|
||||||
else:
|
else:
|
||||||
# if an engine can't be loaded (if for example the engine is missing
|
# if an engine can't be loaded (if for example the engine is missing
|
||||||
# tor or some other requirements) its set to inactive!
|
# tor or some other requirements) its set to inactive!
|
||||||
logger.error(
|
logger.error(
|
||||||
f"(PID {os.getpid()}) {engine_data.get('name', '???')}: can't register engine (loading engine failed)"
|
f"(PID {os.getpid()}) loading engine %s failed: set engine to inactive!", engine_data.get("name", "???")
|
||||||
)
|
)
|
||||||
engine_data["inactive"] = True
|
engine_data["inactive"] = True
|
||||||
return engines
|
return engines
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ def extract_video_data(video_block):
|
|||||||
published_date = None
|
published_date = None
|
||||||
if create_time:
|
if create_time:
|
||||||
try:
|
try:
|
||||||
published_date = datetime.fromisoformat(create_time.strip())
|
published_date = datetime.strptime(create_time.strip(), "%Y-%m-%d")
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
comments_elements = eval_xpath_getindex(entry, xpath_comment, 0, default=None)
|
comments_elements = eval_xpath_getindex(entry, xpath_comment, 0, default=None)
|
||||||
comments: str = "" if comments_elements is None else comments_elements.text
|
comments: str = "" if comments_elements is None else comments_elements.text
|
||||||
|
|
||||||
publishedDate = datetime.fromisoformat(eval_xpath_getindex(entry, xpath_published, 0).text.rstrip("Z"))
|
publishedDate = datetime.strptime(eval_xpath_getindex(entry, xpath_published, 0).text, "%Y-%m-%dT%H:%M:%SZ")
|
||||||
|
|
||||||
res.add(
|
res.add(
|
||||||
res.types.Paper(
|
res.types.Paper(
|
||||||
|
|||||||
@@ -7,17 +7,13 @@
|
|||||||
# There exits a https://github.com/ohblue/baidu-serp-api/
|
# There exits a https://github.com/ohblue/baidu-serp-api/
|
||||||
# but we don't use it here (may we can learn from).
|
# but we don't use it here (may we can learn from).
|
||||||
|
|
||||||
import typing as t
|
|
||||||
|
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from html import unescape
|
from html import unescape
|
||||||
import time
|
import time
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from searx.exceptions import SearxEngineAPIException, SearxEngineCaptchaException, SearxEngineAccessDeniedException
|
from searx.exceptions import SearxEngineAPIException, SearxEngineCaptchaException
|
||||||
from searx.enginelib import EngineCache
|
|
||||||
from searx.network import get as http_get
|
|
||||||
from searx.utils import html_to_text
|
from searx.utils import html_to_text
|
||||||
|
|
||||||
about = {
|
about = {
|
||||||
@@ -39,31 +35,6 @@ baidu_category = 'general'
|
|||||||
time_range_support = True
|
time_range_support = True
|
||||||
time_range_dict = {"day": 86400, "week": 604800, "month": 2592000, "year": 31536000}
|
time_range_dict = {"day": 86400, "week": 604800, "month": 2592000, "year": 31536000}
|
||||||
|
|
||||||
image_base_url = "https://image.baidu.com/"
|
|
||||||
|
|
||||||
COOKIE_CACHE_KEY = "cookie"
|
|
||||||
COOKIE_CACHE_EXPIRATION_SECONDS = 3600
|
|
||||||
|
|
||||||
CACHE: EngineCache
|
|
||||||
"""Stores cookies from Baidu image search warmup."""
|
|
||||||
|
|
||||||
|
|
||||||
def setup(engine_settings: dict[str, t.Any]) -> bool:
|
|
||||||
global CACHE # pylint: disable=global-statement
|
|
||||||
CACHE = EngineCache(engine_settings["name"])
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def get_image_cookies(headers: dict[str, str]) -> dict[str, str]:
|
|
||||||
cookies: dict[str, str] | None = CACHE.get(COOKIE_CACHE_KEY)
|
|
||||||
if cookies:
|
|
||||||
return cookies
|
|
||||||
|
|
||||||
warmup = http_get(image_base_url, headers=headers, timeout=10)
|
|
||||||
cookies = dict(warmup.cookies.items())
|
|
||||||
CACHE.set(key=COOKIE_CACHE_KEY, value=cookies, expire=COOKIE_CACHE_EXPIRATION_SECONDS)
|
|
||||||
return cookies
|
|
||||||
|
|
||||||
|
|
||||||
def init(_):
|
def init(_):
|
||||||
if baidu_category not in ('general', 'images', 'it'):
|
if baidu_category not in ('general', 'images', 'it'):
|
||||||
@@ -117,9 +88,6 @@ def request(query, params):
|
|||||||
if baidu_category == 'it':
|
if baidu_category == 'it':
|
||||||
query_params["paramList"] += f",timestamp_range={past}-{now}"
|
query_params["paramList"] += f",timestamp_range={past}-{now}"
|
||||||
|
|
||||||
if baidu_category == 'images':
|
|
||||||
params["cookies"] = get_image_cookies(params["headers"])
|
|
||||||
|
|
||||||
params["url"] = f"{query_url}?{urlencode(query_params)}"
|
params["url"] = f"{query_url}?{urlencode(query_params)}"
|
||||||
params["allow_redirects"] = False
|
params["allow_redirects"] = False
|
||||||
return params
|
return params
|
||||||
@@ -135,8 +103,6 @@ def response(resp):
|
|||||||
# baidu's JSON encoder wrongly quotes / and ' characters by \\ and \'
|
# baidu's JSON encoder wrongly quotes / and ' characters by \\ and \'
|
||||||
text = text.replace(r"\/", "/").replace(r"\'", "'")
|
text = text.replace(r"\/", "/").replace(r"\'", "'")
|
||||||
data = json.loads(text, strict=False)
|
data = json.loads(text, strict=False)
|
||||||
if data.get("antiFlag") == 1:
|
|
||||||
raise SearxEngineAccessDeniedException(data.get("message", "Forbid spider access"))
|
|
||||||
parsers = {'general': parse_general, 'images': parse_images, 'it': parse_it}
|
parsers = {'general': parse_general, 'images': parse_images, 'it': parse_it}
|
||||||
|
|
||||||
return parsers[baidu_category](data)
|
return parsers[baidu_category](data)
|
||||||
@@ -186,7 +152,7 @@ def parse_images(data):
|
|||||||
img_date = item.get("bdImgnewsDate")
|
img_date = item.get("bdImgnewsDate")
|
||||||
publishedDate = None
|
publishedDate = None
|
||||||
if img_date:
|
if img_date:
|
||||||
publishedDate = datetime.fromisoformat(img_date)
|
publishedDate = datetime.strptime(img_date, "%Y-%m-%d %H:%M")
|
||||||
results.append(
|
results.append(
|
||||||
{
|
{
|
||||||
"template": "images.html",
|
"template": "images.html",
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import random
|
|||||||
import string
|
import string
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from zoneinfo import ZoneInfo
|
|
||||||
|
|
||||||
from searx import utils
|
from searx import utils
|
||||||
|
|
||||||
@@ -32,7 +31,7 @@ base_url = "https://api.bilibili.com/x/web-interface/search/type"
|
|||||||
|
|
||||||
cookie = {
|
cookie = {
|
||||||
"innersign": "0",
|
"innersign": "0",
|
||||||
"buvid3": "".join(random.choices(string.hexdigits, k=16)) + "infoc",
|
"buvid3": "".join(random.choice(string.hexdigits) for _ in range(16)) + "infoc",
|
||||||
"i-wanna-go-back": "-1",
|
"i-wanna-go-back": "-1",
|
||||||
"b_ut": "7",
|
"b_ut": "7",
|
||||||
"FEED_LIVE_VERSION": "V8",
|
"FEED_LIVE_VERSION": "V8",
|
||||||
@@ -40,32 +39,6 @@ cookie = {
|
|||||||
"home_feed_column": "4",
|
"home_feed_column": "4",
|
||||||
}
|
}
|
||||||
|
|
||||||
_CN_TZ = ZoneInfo("Asia/Shanghai")
|
|
||||||
|
|
||||||
# Calendar-day time filter (Asia/Shanghai); dict values are days to subtract from today.
|
|
||||||
time_range_support = True
|
|
||||||
time_range_dict = {"day": 0, "week": 6, "month": 29, "year": 364}
|
|
||||||
|
|
||||||
|
|
||||||
def _pubtime_range(time_range: str) -> tuple[int, int]:
|
|
||||||
"""Return ``(pubtime_begin_s, pubtime_end_s)`` for Bilibili's search API.
|
|
||||||
|
|
||||||
Time ranges follow Bilibili's website semantics: they are counted in
|
|
||||||
**calendar days** in China Standard Time (``Asia/Shanghai``), not as
|
|
||||||
sliding 24-hour windows. For example, ``day`` means from 00:00:00 to
|
|
||||||
23:59:59 of the current local day; ``week`` spans from 00:00:00 on the
|
|
||||||
calendar day six days ago through the end of today, and so on.
|
|
||||||
|
|
||||||
The returned Unix timestamps (seconds) map to Bilibili's
|
|
||||||
``pubtime_begin_s`` and ``pubtime_end_s`` query parameters.
|
|
||||||
"""
|
|
||||||
now = datetime.now(_CN_TZ)
|
|
||||||
pubtime_end_s = int(now.replace(hour=23, minute=59, second=59, microsecond=0).timestamp())
|
|
||||||
begin_day = now - timedelta(days=time_range_dict[time_range])
|
|
||||||
pubtime_begin_s = int(begin_day.replace(hour=0, minute=0, second=0, microsecond=0).timestamp())
|
|
||||||
|
|
||||||
return pubtime_begin_s, pubtime_end_s
|
|
||||||
|
|
||||||
|
|
||||||
def request(query, params):
|
def request(query, params):
|
||||||
query_params = {
|
query_params = {
|
||||||
@@ -77,11 +50,6 @@ def request(query, params):
|
|||||||
"search_type": "video",
|
"search_type": "video",
|
||||||
}
|
}
|
||||||
|
|
||||||
if params.get("time_range") in time_range_dict:
|
|
||||||
pubtime_begin_s, pubtime_end_s = _pubtime_range(params["time_range"])
|
|
||||||
query_params["pubtime_begin_s"] = pubtime_begin_s
|
|
||||||
query_params["pubtime_end_s"] = pubtime_end_s
|
|
||||||
|
|
||||||
params["url"] = f"{base_url}?{urlencode(query_params)}"
|
params["url"] = f"{base_url}?{urlencode(query_params)}"
|
||||||
params["headers"]["Referer"] = "https://www.bilibili.com/"
|
params["headers"]["Referer"] = "https://www.bilibili.com/"
|
||||||
params["headers"]["Accept"] = "application/json, text/javascript, */*; q=0.01"
|
params["headers"]["Accept"] = "application/json, text/javascript, */*; q=0.01"
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ def response(resp):
|
|||||||
"url": 'https://www.bitchute.com/video/' + item['video_id'],
|
"url": 'https://www.bitchute.com/video/' + item['video_id'],
|
||||||
"content": html_to_text(item['description']),
|
"content": html_to_text(item['description']),
|
||||||
"author": item['channel']['channel_name'],
|
"author": item['channel']['channel_name'],
|
||||||
"publishedDate": datetime.fromisoformat(item["date_published"].rstrip("Z")),
|
"publishedDate": datetime.strptime(item["date_published"], "%Y-%m-%dT%H:%M:%S.%fZ"),
|
||||||
"length": item['duration'],
|
"length": item['duration'],
|
||||||
"views": item['view_count'],
|
"views": item['view_count'],
|
||||||
"thumbnail": item['thumbnail_url'],
|
"thumbnail": item['thumbnail_url'],
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
title=_remove_keyword_marker(result["Subject"]),
|
title=_remove_keyword_marker(result["Subject"]),
|
||||||
content=_remove_keyword_marker(result["Text"]),
|
content=_remove_keyword_marker(result["Text"]),
|
||||||
url=result["Url"],
|
url=result["Url"],
|
||||||
publishedDate=datetime.fromisoformat(result["Published"]),
|
publishedDate=datetime.strptime(result["Published"], "%Y-%m-%d %H:%M:%S"),
|
||||||
metadata=gettext.gettext("Posted by {author}").format(author=result["Author"]),
|
metadata=gettext.gettext("Posted by {author}").format(author=result["Author"]),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ from dateutil import parser
|
|||||||
|
|
||||||
from searx.exceptions import SearxEngineAPIException
|
from searx.exceptions import SearxEngineAPIException
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
from searx.utils import html_to_text
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
@@ -76,7 +75,6 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
"q": query,
|
"q": query,
|
||||||
"count": results_per_page,
|
"count": results_per_page,
|
||||||
"offset": (params["pageno"] - 1) * results_per_page,
|
"offset": (params["pageno"] - 1) * results_per_page,
|
||||||
"text_decorations": False,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Apply time filter if specified
|
# Apply time filter if specified
|
||||||
@@ -114,19 +112,14 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
res = EngineResults()
|
res = EngineResults()
|
||||||
data = resp.json()
|
data = resp.json()
|
||||||
|
|
||||||
for result in (data.get("web") or {}).get("results", []):
|
for result in data.get("web", {}).get("results", []):
|
||||||
thumbnail_obj = result.get("thumbnail")
|
|
||||||
thumbnail = ""
|
|
||||||
if thumbnail_obj and not thumbnail_obj.get("logo", False):
|
|
||||||
thumbnail = thumbnail_obj.get("src") or ""
|
|
||||||
|
|
||||||
res.add(
|
res.add(
|
||||||
res.types.MainResult(
|
res.types.MainResult(
|
||||||
url=result["url"],
|
url=result["url"],
|
||||||
title=html_to_text(result["title"]),
|
title=result["title"],
|
||||||
content=html_to_text(result.get("description", "")),
|
content=result.get("description", ""),
|
||||||
publishedDate=_extract_published_date(result.get("age")),
|
publishedDate=_extract_published_date(result.get("age")),
|
||||||
thumbnail=thumbnail,
|
thumbnail=result.get("thumbnail", {}).get("src"),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ def response(resp):
|
|||||||
|
|
||||||
publishedDate = None
|
publishedDate = None
|
||||||
if recipe['submissionDate']:
|
if recipe['submissionDate']:
|
||||||
publishedDate = datetime.fromisoformat(result['recipe']['submissionDate'][:19])
|
publishedDate = datetime.strptime(result['recipe']['submissionDate'][:19], "%Y-%m-%dT%H:%M:%S")
|
||||||
|
|
||||||
content = [
|
content = [
|
||||||
f"Schwierigkeitsstufe (1-3): {recipe['difficulty']}",
|
f"Schwierigkeitsstufe (1-3): {recipe['difficulty']}",
|
||||||
|
|||||||
@@ -1,168 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Engine to search using the official `Exa Search API`_. Exa is a search engine for AI agents.
|
|
||||||
|
|
||||||
.. _Exa Search API: https://exa.ai/docs/reference/search
|
|
||||||
|
|
||||||
Configuration
|
|
||||||
=============
|
|
||||||
|
|
||||||
The engine has the following mandatory setting:
|
|
||||||
|
|
||||||
- :py:obj:`api_key`
|
|
||||||
|
|
||||||
You can obtain an API key from the `API Key section <https://dashboard.exa.ai/api-keys>`_ in the Exa dashboard.
|
|
||||||
|
|
||||||
Optional settings are:
|
|
||||||
|
|
||||||
- :py:obj:`results_per_page`
|
|
||||||
- :py:obj:`search_type`
|
|
||||||
- :py:obj:`content_mode`
|
|
||||||
- :py:obj:`content_max_characters`
|
|
||||||
|
|
||||||
.. code:: yaml
|
|
||||||
|
|
||||||
- name: exaapi
|
|
||||||
engine: exaapi
|
|
||||||
shortcut: exa
|
|
||||||
api_key: "..."
|
|
||||||
results_per_page: 10
|
|
||||||
search_type: auto
|
|
||||||
content_mode: highlights
|
|
||||||
inactive: false
|
|
||||||
|
|
||||||
The API supports SafeSearch and region-aware results.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import typing as t
|
|
||||||
|
|
||||||
from dateutil import parser
|
|
||||||
|
|
||||||
from searx.exceptions import SearxEngineAPIException
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
from searx.utils import html_to_text
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
|
|
||||||
SearchType = t.Literal["fast", "auto", "instant", "deep", "deep-lite", "deep-reasoning"]
|
|
||||||
ContentMode = t.Literal["highlights", "text"]
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://exa.ai",
|
|
||||||
"wikidata_id": None,
|
|
||||||
"official_api_documentation": "https://exa.ai/docs/reference/search",
|
|
||||||
"use_official_api": True,
|
|
||||||
"require_api_key": True,
|
|
||||||
"results": "JSON",
|
|
||||||
}
|
|
||||||
|
|
||||||
api_key: str = ""
|
|
||||||
"""API key for Exa Search API (required)."""
|
|
||||||
|
|
||||||
categories = ["general", "web"]
|
|
||||||
safesearch = True
|
|
||||||
|
|
||||||
base_url = "https://api.exa.ai/search"
|
|
||||||
results_per_page: int = 10
|
|
||||||
"""Maximum number of results per request. Value must be between 1 and 100, default is 10."""
|
|
||||||
|
|
||||||
search_type: SearchType = "auto"
|
|
||||||
"""Search type. Default is auto, see documentation for more information."""
|
|
||||||
|
|
||||||
content_mode: ContentMode = "highlights"
|
|
||||||
"""Content to request from the API: ``highlights`` (excerpts) or ``text`` (page text)."""
|
|
||||||
|
|
||||||
content_max_characters: int = 500
|
|
||||||
"""Maximum characters for the requested content."""
|
|
||||||
|
|
||||||
|
|
||||||
def init(_):
|
|
||||||
if not api_key:
|
|
||||||
raise SearxEngineAPIException("No API key provided")
|
|
||||||
if not 1 <= results_per_page <= 100:
|
|
||||||
raise ValueError("results_per_page must be between 1 and 100")
|
|
||||||
if search_type not in t.get_args(SearchType):
|
|
||||||
raise ValueError(f"Unsupported search type: {search_type}")
|
|
||||||
if content_mode not in t.get_args(ContentMode):
|
|
||||||
raise ValueError(f"Unsupported content mode: {content_mode}")
|
|
||||||
if content_max_characters < 1:
|
|
||||||
raise ValueError("content_max_characters must be at least 1")
|
|
||||||
|
|
||||||
|
|
||||||
def _contents_payload() -> dict[str, t.Any]:
|
|
||||||
if content_mode == "text":
|
|
||||||
return {"text": {"maxCharacters": content_max_characters, "stripLinks": True}}
|
|
||||||
return {"highlights": {"maxCharacters": content_max_characters}}
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_content(result: dict[str, t.Any]) -> str:
|
|
||||||
if content_mode == "text":
|
|
||||||
return html_to_text(result.get("text") or "")
|
|
||||||
return html_to_text(" ".join(result.get("highlights") or []))
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
|
||||||
"""Create the API request."""
|
|
||||||
body: dict[str, t.Any] = {
|
|
||||||
"query": query,
|
|
||||||
"type": search_type,
|
|
||||||
"numResults": results_per_page,
|
|
||||||
"contents": _contents_payload(),
|
|
||||||
}
|
|
||||||
|
|
||||||
# Apply SafeSearch if enabled
|
|
||||||
if params["safesearch"]:
|
|
||||||
body["moderation"] = True
|
|
||||||
|
|
||||||
# Apply region-aware results if specified
|
|
||||||
locale_parts = params["searxng_locale"].split("-")
|
|
||||||
region = locale_parts[-1]
|
|
||||||
if len(locale_parts) > 1:
|
|
||||||
body["userLocation"] = region.upper()
|
|
||||||
|
|
||||||
params["url"] = base_url
|
|
||||||
params["method"] = "POST"
|
|
||||||
params["headers"]["x-api-key"] = api_key
|
|
||||||
params["json"] = body
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_published_date(value: str | None):
|
|
||||||
"""Extract and parse the published date from the API response.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
value: Raw date string from the API
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Parsed datetime object or None if parsing fails
|
|
||||||
"""
|
|
||||||
if not value:
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
return parser.parse(value)
|
|
||||||
except (parser.ParserError, TypeError, OverflowError):
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
|
||||||
"""Process the API response and return results."""
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
for result in resp.json().get("results", []):
|
|
||||||
url = result.get("url")
|
|
||||||
if not url:
|
|
||||||
continue
|
|
||||||
|
|
||||||
res.add(
|
|
||||||
res.types.MainResult(
|
|
||||||
url=url,
|
|
||||||
title=html_to_text(result.get("title") or url),
|
|
||||||
content=_extract_content(result),
|
|
||||||
thumbnail=result.get("image") or "",
|
|
||||||
publishedDate=_extract_published_date(result.get("publishedDate")),
|
|
||||||
author=result.get("author") or "",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return res
|
|
||||||
@@ -37,7 +37,7 @@ def response(resp):
|
|||||||
for item in search_res:
|
for item in search_res:
|
||||||
img = 'https://s3.thehackerblog.com/findthatmeme/' + item['image_path']
|
img = 'https://s3.thehackerblog.com/findthatmeme/' + item['image_path']
|
||||||
thumb = 'https://s3.thehackerblog.com/findthatmeme/thumb/' + item.get('thumbnail', '')
|
thumb = 'https://s3.thehackerblog.com/findthatmeme/thumb/' + item.get('thumbnail', '')
|
||||||
date = datetime.fromisoformat(item["updated_at"].split("T")[0])
|
date = datetime.strptime(item["updated_at"].split("T")[0], "%Y-%m-%d")
|
||||||
formatted_date = datetime.fromtimestamp(date.timestamp())
|
formatted_date = datetime.fromtimestamp(date.timestamp())
|
||||||
|
|
||||||
results.append(
|
results.append(
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ def response(resp: "SXNG_Response"):
|
|||||||
title=result["title"],
|
title=result["title"],
|
||||||
content=result["description"],
|
content=result["description"],
|
||||||
thumbnail=result["smallImageURL"],
|
thumbnail=result["smallImageURL"],
|
||||||
publishedDate=datetime.fromisoformat(result["status_since"]),
|
publishedDate=datetime.strptime(result["status_since"], "%Y-%m-%d %H:%M:%S"),
|
||||||
metadata=f"Rank: {result['rank']} || {result['episode_count']} episodes",
|
metadata=f"Rank: {result['rank']} || {result['episode_count']} episodes",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ from searx.utils import (
|
|||||||
eval_xpath_getindex,
|
eval_xpath_getindex,
|
||||||
eval_xpath_list,
|
eval_xpath_list,
|
||||||
extract_text,
|
extract_text,
|
||||||
|
gen_gsa_useragent,
|
||||||
)
|
)
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
@@ -196,7 +197,7 @@ def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[st
|
|||||||
# https://developers.google.com/custom-search/docs/xml_results_appendices#interfaceLanguages
|
# https://developers.google.com/custom-search/docs/xml_results_appendices#interfaceLanguages
|
||||||
|
|
||||||
# https://github.com/searxng/searxng/issues/2515#issuecomment-1607150817
|
# https://github.com/searxng/searxng/issues/2515#issuecomment-1607150817
|
||||||
ret_val["params"]["hl"] = f"{lang_code}"
|
ret_val["params"]["hl"] = f"{lang_code}-{country}"
|
||||||
|
|
||||||
# lr parameter:
|
# lr parameter:
|
||||||
# The lr (language restrict) parameter restricts search results to
|
# The lr (language restrict) parameter restricts search results to
|
||||||
@@ -267,6 +268,7 @@ def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[st
|
|||||||
# HTTP headers
|
# HTTP headers
|
||||||
|
|
||||||
ret_val["headers"]["Accept"] = "*/*"
|
ret_val["headers"]["Accept"] = "*/*"
|
||||||
|
ret_val["headers"]["User-Agent"] = gen_gsa_useragent()
|
||||||
|
|
||||||
# Cookies
|
# Cookies
|
||||||
|
|
||||||
|
|||||||
@@ -1,190 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Google Custom Search Engine"""
|
|
||||||
|
|
||||||
import datetime
|
|
||||||
import typing as t
|
|
||||||
from json import loads
|
|
||||||
from urllib.parse import urlencode
|
|
||||||
|
|
||||||
from searx.enginelib import EngineCache
|
|
||||||
from searx.exceptions import SearxEngineAPIException, SearxEngineTooManyRequestsException
|
|
||||||
from searx.network import get
|
|
||||||
from searx.result_types import EngineResults, Result, MainResult, Image
|
|
||||||
|
|
||||||
from searx.engines.google import fetch_traits # pylint: disable=unused-import
|
|
||||||
from searx.engines.google import filter_mapping, get_google_info
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://www.google.com",
|
|
||||||
"wikidata_id": "Q2233943",
|
|
||||||
"official_api_documentation": "https://developers.google.com/custom-search/docs/element",
|
|
||||||
"use_official_api": False,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "JSONP",
|
|
||||||
"description": "Platform for creating custom search engines based on Google Search.",
|
|
||||||
}
|
|
||||||
|
|
||||||
categories = ["general", "web"]
|
|
||||||
paging = True
|
|
||||||
max_page = 5
|
|
||||||
page_size = 20
|
|
||||||
time_range_support = True
|
|
||||||
language_support = True
|
|
||||||
safesearch = True
|
|
||||||
|
|
||||||
GoogleCategType = t.Literal["", "image"]
|
|
||||||
google_categ: GoogleCategType = ""
|
|
||||||
"""Google CSE category. Set to ``""`` for web search."""
|
|
||||||
|
|
||||||
CX = "partner-pub-8993703457585266:4862972284" # blackle.com
|
|
||||||
|
|
||||||
CACHE: EngineCache
|
|
||||||
|
|
||||||
|
|
||||||
def setup(engine_settings: dict[str, t.Any]) -> bool:
|
|
||||||
global CACHE # pylint: disable=global-statement
|
|
||||||
|
|
||||||
if google_categ not in t.get_args(GoogleCategType):
|
|
||||||
raise ValueError("invalid google cse category: %s" % google_categ)
|
|
||||||
|
|
||||||
CACHE = EngineCache(engine_settings["name"])
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def _cse_token() -> dict[str, str]:
|
|
||||||
token: dict[str, str] = CACHE.get(CX)
|
|
||||||
if token:
|
|
||||||
return token
|
|
||||||
|
|
||||||
resp = get(f"https://www.google.com/cse/cse.js?cx={CX}", timeout=10)
|
|
||||||
if not resp.ok:
|
|
||||||
raise SearxEngineAPIException("failed to obtain cse token")
|
|
||||||
|
|
||||||
end = resp.text.rfind("});")
|
|
||||||
start = resp.text.rfind("({")
|
|
||||||
opts: dict[str, str] = loads(resp.text[start + 1 : end + 1])
|
|
||||||
|
|
||||||
cse_tok = opts.get("cse_token")
|
|
||||||
if not cse_tok:
|
|
||||||
raise SearxEngineAPIException("failed to obtain cse token")
|
|
||||||
|
|
||||||
exp = opts.get("exp")
|
|
||||||
token = {
|
|
||||||
"cse_tok": cse_tok,
|
|
||||||
"cselibv": opts.get("cselibVersion", ""),
|
|
||||||
"exp": ",".join(exp) if exp else "",
|
|
||||||
}
|
|
||||||
CACHE.set(CX, token, expire=3600)
|
|
||||||
return token
|
|
||||||
|
|
||||||
|
|
||||||
def _get_start_and_end_date_str(time_range: str) -> tuple[str, str]:
|
|
||||||
time_range_map = {"day": 1, "week": 7, "month": 30, "year": 365}
|
|
||||||
|
|
||||||
end_date = datetime.datetime.now()
|
|
||||||
start_date = end_date - datetime.timedelta(days=time_range_map[time_range])
|
|
||||||
|
|
||||||
return start_date.strftime("%Y%m%d"), end_date.strftime("%Y%m%d")
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
|
||||||
token = _cse_token()
|
|
||||||
|
|
||||||
google_info = get_google_info(params, traits)
|
|
||||||
info: dict[str, str] = google_info["params"]
|
|
||||||
|
|
||||||
args = {
|
|
||||||
"rsz": "filtered_cse",
|
|
||||||
"num": str(page_size),
|
|
||||||
"hl": info["hl"],
|
|
||||||
"cselibv": token["cselibv"],
|
|
||||||
"cx": CX,
|
|
||||||
"q": query,
|
|
||||||
"safe": filter_mapping[params["safesearch"]],
|
|
||||||
"cse_tok": token["cse_tok"],
|
|
||||||
"callback": "_",
|
|
||||||
"rurl": "",
|
|
||||||
"searchtype": google_categ,
|
|
||||||
}
|
|
||||||
if params["time_range"]:
|
|
||||||
start_date, end_date = _get_start_and_end_date_str(params["time_range"])
|
|
||||||
args["sort"] = f"date:r:{start_date}:{end_date}"
|
|
||||||
|
|
||||||
if info.get("lr"):
|
|
||||||
args["lr"] = info["lr"]
|
|
||||||
if info.get("cr"):
|
|
||||||
args["cr"] = info["cr"]
|
|
||||||
if google_info["country"] not in (None, "ZZ"):
|
|
||||||
args["gl"] = google_info["country"]
|
|
||||||
if token["exp"]:
|
|
||||||
args["exp"] = token["exp"]
|
|
||||||
|
|
||||||
start = (params["pageno"] - 1) * page_size
|
|
||||||
if start:
|
|
||||||
args["start"] = str(start)
|
|
||||||
|
|
||||||
params["url"] = "https://cse.google.com/cse/element/v1?" + urlencode(args)
|
|
||||||
params["cookies"] = google_info["cookies"]
|
|
||||||
params["headers"].update(google_info["headers"])
|
|
||||||
params["headers"]["Referer"] = "https://cse.google.com/"
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
|
||||||
json_resp = resp.text[resp.text.find("{") : resp.text.rfind("}") + 1]
|
|
||||||
data = loads(json_resp)
|
|
||||||
|
|
||||||
# not the real types, but a sufficient approximation
|
|
||||||
item: dict[str, str]
|
|
||||||
error: dict[str, str | int]
|
|
||||||
|
|
||||||
if error := data.get("error"):
|
|
||||||
message = error.get("message", "unknown error")
|
|
||||||
if error.get("code") == 429:
|
|
||||||
raise SearxEngineTooManyRequestsException(message=f"google cse: {message}")
|
|
||||||
raise SearxEngineAPIException(f"google cse: {message}")
|
|
||||||
|
|
||||||
results = EngineResults()
|
|
||||||
|
|
||||||
for item in data.get("results", []):
|
|
||||||
|
|
||||||
res: Result | None
|
|
||||||
if google_categ == "":
|
|
||||||
res = web_item(item)
|
|
||||||
elif google_categ == "image":
|
|
||||||
res = img_item(item)
|
|
||||||
|
|
||||||
if res is not None:
|
|
||||||
results.add(res)
|
|
||||||
|
|
||||||
return results
|
|
||||||
|
|
||||||
|
|
||||||
def web_item(item: dict[str, str]) -> MainResult | None:
|
|
||||||
url = item.get("unescapedUrl")
|
|
||||||
if not url:
|
|
||||||
return None
|
|
||||||
return MainResult(
|
|
||||||
url=url,
|
|
||||||
title=item.get("titleNoFormatting", ""),
|
|
||||||
content=item.get("contentNoFormatting", ""),
|
|
||||||
thumbnail=item.get("richSnippet", {}).get("cseThumbnail", {}).get("src", ""), # type: ignore
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def img_item(item: dict[str, str]) -> Image | None:
|
|
||||||
resolution = ""
|
|
||||||
if item.get("height") and item.get("width"):
|
|
||||||
resolution = f"{item['width']}x{item['height']}"
|
|
||||||
return Image(
|
|
||||||
url=item["originalContextUrl"],
|
|
||||||
title=item.get("titleNoFormatting", ""),
|
|
||||||
content=item.get("contentNoFormatting", ""),
|
|
||||||
img_src=item["unescapedUrl"],
|
|
||||||
thumbnail_src=item["tbUrl"],
|
|
||||||
resolution=resolution,
|
|
||||||
img_format=item["fileFormat"].split("/")[-1],
|
|
||||||
)
|
|
||||||
@@ -14,11 +14,8 @@ from urllib.parse import urlencode
|
|||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
from searx.enginelib import EngineCache
|
from searx.exceptions import SearxEngineAccessDeniedException
|
||||||
from searx.network import get
|
|
||||||
from searx.exceptions import SearxEngineAPIException, SearxEngineAccessDeniedException
|
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
from searx.utils import gen_useragent
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
@@ -41,46 +38,14 @@ heexy_categ = "web"
|
|||||||
"""Category to search in. Can be either "web" or "image"."""
|
"""Category to search in. Can be either "web" or "image"."""
|
||||||
|
|
||||||
|
|
||||||
base_url = "https://heexy.org"
|
base_url = "https://seapi.heexy.org"
|
||||||
api_url = "https://seapi.heexy.org"
|
|
||||||
safe_search_map = {0: "off", 1: "on", 2: "on"}
|
safe_search_map = {0: "off", 1: "on", 2: "on"}
|
||||||
|
|
||||||
CACHE: EngineCache
|
|
||||||
"""Cache for storing the ``X-Data-Cacheft`` token (acts like an API key)."""
|
|
||||||
|
|
||||||
|
|
||||||
def setup(engine_settings: dict[str, t.Any]) -> bool:
|
|
||||||
global CACHE # pylint: disable=global-statement
|
|
||||||
|
|
||||||
|
def init(_):
|
||||||
if heexy_categ not in ("web", "image"):
|
if heexy_categ not in ("web", "image"):
|
||||||
raise ValueError("invalid search category: %s" % heexy_categ)
|
raise ValueError("invalid search category: %s" % heexy_categ)
|
||||||
|
|
||||||
CACHE = EngineCache(engine_settings["name"])
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def _get_api_token(query: str) -> str:
|
|
||||||
"""The API token is independent of the search query. We just need any query
|
|
||||||
to obtain it initially, and don't hardcode it here to decrease chances of
|
|
||||||
getting blocked. The token must be passed as ``X-Data-Cacheft`` header."""
|
|
||||||
|
|
||||||
cached_token: str = CACHE.get("token")
|
|
||||||
if cached_token:
|
|
||||||
return cached_token
|
|
||||||
|
|
||||||
resp = get(
|
|
||||||
f"{base_url}/search?q={query}", headers={"User-Agent": gen_useragent(), "Accept-Language": "en-US,en:q=0.9"}
|
|
||||||
)
|
|
||||||
if not resp.ok:
|
|
||||||
raise SearxEngineAPIException("failed to obtain request token: invalid response code")
|
|
||||||
|
|
||||||
token = resp.cookies["cacheft"]
|
|
||||||
if not token:
|
|
||||||
raise SearxEngineAPIException("failed to obtain request token: no token found")
|
|
||||||
|
|
||||||
CACHE.set("token", token, expire=3 * 60)
|
|
||||||
return token
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
def request(query: str, params: "OnlineParams") -> None:
|
||||||
args = {
|
args = {
|
||||||
@@ -91,10 +56,8 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
if params["searxng_locale"] != "all":
|
if params["searxng_locale"] != "all":
|
||||||
args["lang"] = params["searxng_locale"].split("-")[0]
|
args["lang"] = params["searxng_locale"].split("-")[0]
|
||||||
|
|
||||||
params["url"] = f"{api_url}/search/{heexy_categ}?{urlencode(args)}"
|
params["url"] = f"{base_url}/search/{heexy_categ}?{urlencode(args)}"
|
||||||
|
params["headers"]["Origin"] = base_url
|
||||||
params["headers"]["Origin"] = api_url
|
|
||||||
params["cookies"]["cacheft"] = _get_api_token(query)
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response"):
|
def response(resp: "SXNG_Response"):
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ def response(resp) -> EngineResults:
|
|||||||
|
|
||||||
published_date = None
|
published_date = None
|
||||||
try:
|
try:
|
||||||
published_date = datetime.fromisoformat(entry["createdAt"].rstrip("Z"))
|
published_date = datetime.strptime(entry["createdAt"], "%Y-%m-%dT%H:%M:%S.%fZ")
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ def _result(video: dict[str, typing.Any], album_info: dict[str, typing.Any]):
|
|||||||
release_time = album_info.get("releaseTime", {}).get("value")
|
release_time = album_info.get("releaseTime", {}).get("value")
|
||||||
if release_time:
|
if release_time:
|
||||||
try:
|
try:
|
||||||
published_date = datetime.fromisoformat(release_time)
|
published_date = datetime.strptime(release_time, "%Y-%m-%d")
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Jina is a search AI and part of Elastic, the company behind ElasticSearch.
|
|
||||||
|
|
||||||
The engine requires an API key, you can get one from the
|
|
||||||
`API dashboard <https://jina.ai/api-dashboard/>`_ without signup.
|
|
||||||
|
|
||||||
.. code:: yaml
|
|
||||||
|
|
||||||
- name: jina
|
|
||||||
engine: jina
|
|
||||||
shortcut: ji
|
|
||||||
api_key: "jina_..."
|
|
||||||
jina_engine: reader
|
|
||||||
inactive: false
|
|
||||||
|
|
||||||
By default, Jina's own index is used. You can change that by setting a different :py:obj:`jina_engine`.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import typing as t
|
|
||||||
from urllib.parse import urlencode
|
|
||||||
|
|
||||||
from dateutil import parser
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://jina.ai",
|
|
||||||
"wikidata_id": None,
|
|
||||||
"official_api_documentation": "https://s.jina.ai/docs",
|
|
||||||
"use_official_api": True,
|
|
||||||
"require_api_key": True,
|
|
||||||
"results": "JSON",
|
|
||||||
}
|
|
||||||
|
|
||||||
categories = ["general"]
|
|
||||||
paging = True
|
|
||||||
|
|
||||||
jina_engine = "reader"
|
|
||||||
"""Search mode. Currently supported values are 'reader', 'google' and 'bing'."""
|
|
||||||
|
|
||||||
base_url = "https://s.jina.ai"
|
|
||||||
api_key: str | None = None
|
|
||||||
|
|
||||||
|
|
||||||
def setup(_):
|
|
||||||
if not api_key:
|
|
||||||
raise ValueError("missing api key")
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams"):
|
|
||||||
# setting 'no-content' pushes the response time down to a third
|
|
||||||
args = {"q": query, "page": params["pageno"], "engine": jina_engine, "respondWith": "no-content"}
|
|
||||||
params["url"] = f"{base_url}/?{urlencode(args)}"
|
|
||||||
params["headers"].update(
|
|
||||||
{
|
|
||||||
"Accept": "application/json",
|
|
||||||
"Authorization": f"Bearer {api_key}",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response"):
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
json_resp: dict[str, t.Any] = resp.json()
|
|
||||||
|
|
||||||
result: dict[str, str]
|
|
||||||
for result in json_resp["data"]:
|
|
||||||
published_date = None
|
|
||||||
if result.get("date"):
|
|
||||||
try:
|
|
||||||
published_date = parser.parse(result["date"])
|
|
||||||
except parser.ParserError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
res.add(
|
|
||||||
res.types.MainResult(
|
|
||||||
url=result["url"],
|
|
||||||
title=result["title"],
|
|
||||||
content=result["description"],
|
|
||||||
publishedDate=published_date,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return res
|
|
||||||
@@ -42,14 +42,15 @@ To enable Kagi, add the following to the ``engines`` seciton of
|
|||||||
.. _Api Portal: https://help.kagi.com/kagi/api/overview.html
|
.. _Api Portal: https://help.kagi.com/kagi/api/overview.html
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
import html
|
||||||
|
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
from searx.utils import html_to_text, parse_duration_string
|
from searx.utils import parse_duration_string
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
from searx.search.processors import OnlineParams
|
from searx.search.processors import OnlineParams
|
||||||
@@ -76,12 +77,7 @@ kagi_categ: t.Literal["search", "images", "news", "videos"] = "search"
|
|||||||
base_url = "https://kagi.com"
|
base_url = "https://kagi.com"
|
||||||
|
|
||||||
safe_search_map = {0: False, 1: True, 2: True}
|
safe_search_map = {0: False, 1: True, 2: True}
|
||||||
time_range_to_days_map: dict[TimeRangeType, int] = {
|
time_range_to_days_map: dict[TimeRangeType, int] = {"day": 1, "week": 7, "month": 30, "year": 365}
|
||||||
"day": 1,
|
|
||||||
"week": 7,
|
|
||||||
"month": 30,
|
|
||||||
"year": 365,
|
|
||||||
}
|
|
||||||
|
|
||||||
api_key = ""
|
api_key = ""
|
||||||
"""Kagi API key. Required for using this engine."""
|
"""Kagi API key. Required for using this engine."""
|
||||||
@@ -139,13 +135,9 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
|
|
||||||
if kagi_categ in ("images", "videos"):
|
if kagi_categ in ("images", "videos"):
|
||||||
# the JSON key is "image" for "images" and "video" for "videos"
|
# the JSON key is "image" for "images" and "video" for "videos"
|
||||||
json_results = json_data["data"].get(kagi_categ[:-1])
|
json_results = json_data["data"][kagi_categ[:-1]]
|
||||||
else:
|
else:
|
||||||
json_results = json_data["data"].get(kagi_categ)
|
json_results = json_data["data"][kagi_categ]
|
||||||
|
|
||||||
# if no results were found, the response doesn't contain the results field
|
|
||||||
if not json_results:
|
|
||||||
return res
|
|
||||||
|
|
||||||
for result in json_results:
|
for result in json_results:
|
||||||
published_date: datetime | None = None
|
published_date: datetime | None = None
|
||||||
@@ -156,8 +148,8 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
res.add(
|
res.add(
|
||||||
res.types.MainResult(
|
res.types.MainResult(
|
||||||
url=result["url"],
|
url=result["url"],
|
||||||
title=html_to_text(result.get("title", "no title available")),
|
title=html.unescape(result["title"]),
|
||||||
content=html_to_text(result.get("snippet", "")),
|
content=html.unescape(result["snippet"]),
|
||||||
thumbnail=result.get("image", {}).get("url") or "",
|
thumbnail=result.get("image", {}).get("url") or "",
|
||||||
publishedDate=published_date,
|
publishedDate=published_date,
|
||||||
)
|
)
|
||||||
@@ -166,15 +158,15 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
res.add(
|
res.add(
|
||||||
res.types.Image(
|
res.types.Image(
|
||||||
url=result["url"],
|
url=result["url"],
|
||||||
title=html_to_text(result.get("title", "no title available")),
|
title=html.unescape(result.get("title")),
|
||||||
img_src=result.get("image", {}).get("url"),
|
img_src=result.get("image", {}).get("url"),
|
||||||
resolution=f"{result.get('image', {}).get('width')}x{result.get('image', {}).get('height')}",
|
resolution=f"{result['image']['width']}x{result['image']['height']}",
|
||||||
thumbnail_src=result.get("props", {}).get("thumbnail", {}).get("url"),
|
thumbnail_src=result.get("props", {}).get("thumbnail", {}).get("url"),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
elif kagi_categ == "videos":
|
elif kagi_categ == "videos":
|
||||||
length: timedelta | None = None
|
length: timedelta | None = None
|
||||||
if result.get("props", {}).get("duration"):
|
if result["props"].get("duration"):
|
||||||
length = parse_duration_string(result["props"]["duration"])
|
length = parse_duration_string(result["props"]["duration"])
|
||||||
|
|
||||||
res.add(
|
res.add(
|
||||||
@@ -182,11 +174,11 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
{
|
{
|
||||||
"template": "videos.html",
|
"template": "videos.html",
|
||||||
"url": result["url"],
|
"url": result["url"],
|
||||||
"title": html_to_text(result.get("title", "no title available")),
|
"title": html.unescape(result["title"]),
|
||||||
"content": html_to_text(result.get("snippet", "")),
|
"content": html.unescape(result["snippet"]),
|
||||||
"thumbnail": result.get("image", {}).get("url"),
|
"thumbnail": result.get("image", {}).get("url"),
|
||||||
"publishedDate": published_date,
|
"publishedDate": published_date,
|
||||||
"author": result.get("props", {}).get("creator_name"),
|
"author": result["props"].get("creator_name"),
|
||||||
"length": length,
|
"length": length,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,66 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Keenable is a fast web search with keyless mode support"""
|
|
||||||
|
|
||||||
import typing as t
|
|
||||||
|
|
||||||
from datetime import datetime
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
from searx.utils import searxng_useragent
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://keenable.ai",
|
|
||||||
"official_api_documentation": "https://docs.keenable.ai",
|
|
||||||
"use_official_api": True,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "JSON",
|
|
||||||
}
|
|
||||||
api_key = ""
|
|
||||||
""" Optional API Key. You can create a key at `the official website
|
|
||||||
<https://keenable.ai/signup>'_ if you need higher rate limits."""
|
|
||||||
|
|
||||||
categories = ["general"]
|
|
||||||
|
|
||||||
base_url = "https://api.keenable.ai"
|
|
||||||
keenable_mode = "pro"
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams"):
|
|
||||||
if api_key:
|
|
||||||
params["url"] = f"{base_url}/v1/search"
|
|
||||||
params["headers"]["X-API-KEY"] = api_key
|
|
||||||
else:
|
|
||||||
params["url"] = f"{base_url}/v1/search/public"
|
|
||||||
|
|
||||||
params["method"] = "POST"
|
|
||||||
params["headers"]["X-Keenable-Title"] = searxng_useragent()
|
|
||||||
params["json"] = {"query": query, "mode": keenable_mode}
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
results: list[dict[str, str]] = resp.json()["results"] # type: ignore[reportAny]
|
|
||||||
|
|
||||||
for result in results:
|
|
||||||
published = None
|
|
||||||
pub = result.get("published_at")
|
|
||||||
if pub:
|
|
||||||
try:
|
|
||||||
published = datetime.fromisoformat(pub.rstrip("Z"))
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
res.add(
|
|
||||||
res.types.MainResult(
|
|
||||||
url=result["url"],
|
|
||||||
title=result["title"],
|
|
||||||
content=result["description"] or result["snippet"],
|
|
||||||
publishedDate=published,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return res
|
|
||||||
@@ -92,7 +92,7 @@ def _get_communities(json):
|
|||||||
'title': result['community']['title'],
|
'title': result['community']['title'],
|
||||||
'content': markdown_to_text(result['community'].get('description', '')),
|
'content': markdown_to_text(result['community'].get('description', '')),
|
||||||
'thumbnail': result['community'].get('icon', result['community'].get('banner')),
|
'thumbnail': result['community'].get('icon', result['community'].get('banner')),
|
||||||
'publishedDate': datetime.fromisoformat(counts['published'][:19]),
|
'publishedDate': datetime.strptime(counts['published'][:19], '%Y-%m-%dT%H:%M:%S'),
|
||||||
'metadata': metadata,
|
'metadata': metadata,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -141,7 +141,7 @@ def _get_posts(json):
|
|||||||
'title': result['post']['name'],
|
'title': result['post']['name'],
|
||||||
'content': content,
|
'content': content,
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': thumbnail,
|
||||||
'publishedDate': datetime.fromisoformat(result['post']['published'][:19]),
|
'publishedDate': datetime.strptime(result['post']['published'][:19], '%Y-%m-%dT%H:%M:%S'),
|
||||||
'metadata': metadata,
|
'metadata': metadata,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -170,7 +170,7 @@ def _get_comments(json):
|
|||||||
'url': result['comment']['ap_id'],
|
'url': result['comment']['ap_id'],
|
||||||
'title': result['post']['name'],
|
'title': result['post']['name'],
|
||||||
'content': markdown_to_text(result['comment']['content']),
|
'content': markdown_to_text(result['comment']['content']),
|
||||||
'publishedDate': datetime.fromisoformat(result['comment']['published'][:19]),
|
'publishedDate': datetime.strptime(result['comment']['published'][:19], '%Y-%m-%dT%H:%M:%S'),
|
||||||
'metadata': metadata,
|
'metadata': metadata,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Magnific_ is a database for images.
|
|
||||||
|
|
||||||
.. _Magnific: https://www.magnific.com
|
|
||||||
"""
|
|
||||||
|
|
||||||
from urllib.parse import urlencode
|
|
||||||
|
|
||||||
import typing as t
|
|
||||||
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://www.magnific.com",
|
|
||||||
"wikidata_id": "Q104211654",
|
|
||||||
"official_api_documentation": None,
|
|
||||||
"use_official_api": False,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "JSON",
|
|
||||||
}
|
|
||||||
|
|
||||||
base_url = "https://www.magnific.com"
|
|
||||||
|
|
||||||
categories = ["images"]
|
|
||||||
paging = True
|
|
||||||
|
|
||||||
free_images_only = True
|
|
||||||
"""
|
|
||||||
Whether to only load images that may be used for free, without a Magnific account.
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
|
||||||
args = {"term": query, "filters[ai-generated][excluded]": 1, "page": params["pageno"], "locale": "en"}
|
|
||||||
if free_images_only:
|
|
||||||
args["filters[license]"] = "free"
|
|
||||||
|
|
||||||
params["headers"]["Referer"] = f"{base_url}/search"
|
|
||||||
params["url"] = f"{base_url}/api/regular/search?{urlencode(args)}"
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response"):
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
result: dict[str, t.Any] # TBH: dict[str, t.Any]
|
|
||||||
for result in resp.json()["items"]:
|
|
||||||
res.add(
|
|
||||||
res.types.Image(
|
|
||||||
title=result["name"],
|
|
||||||
url=result["url"],
|
|
||||||
thumbnail_src=result["preview"]["url"],
|
|
||||||
img_src=result["preview"]["url"],
|
|
||||||
resolution=f"{result['preview']['width']}x{result['preview']['height']}",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return res
|
|
||||||
@@ -60,7 +60,7 @@ def response(resp):
|
|||||||
'title': result['username'] + f" ({result['followers_count']} followers)",
|
'title': result['username'] + f" ({result['followers_count']} followers)",
|
||||||
'content': result['note'],
|
'content': result['note'],
|
||||||
'thumbnail': result.get('avatar'),
|
'thumbnail': result.get('avatar'),
|
||||||
'publishedDate': datetime.fromisoformat(result['created_at'][:10]),
|
'publishedDate': datetime.strptime(result['created_at'][:10], "%Y-%m-%d"),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
elif mastodon_type == "hashtags":
|
elif mastodon_type == "hashtags":
|
||||||
|
|||||||
@@ -99,35 +99,23 @@ def parse_general(data):
|
|||||||
|
|
||||||
dom = html.fromstring(data)
|
dom = html.fromstring(data)
|
||||||
|
|
||||||
for item in eval_xpath_list(dom, "//div[contains(@class, 'fds-web-normal-doc-root')]"):
|
for item in eval_xpath_list(dom, "//ul[contains(@class, 'lst_total')]/li[contains(@class, 'bx')]"):
|
||||||
thumbnail = extract_text(
|
thumbnail = None
|
||||||
eval_xpath(
|
|
||||||
item,
|
|
||||||
".//div[contains(@class, 'sds-comps-image') and not(contains(@class, 'sds-comps-image-circle'))]/img/@src",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
title = extract_text(eval_xpath(item, ".//span[contains(@class, 'sds-comps-text-type-headline1')]"))
|
|
||||||
|
|
||||||
url = None
|
|
||||||
try:
|
try:
|
||||||
url = eval_xpath_getindex(
|
thumbnail = eval_xpath_getindex(item, ".//div[contains(@class, 'thumb_single')]//img/@data-lazysrc", 0)
|
||||||
item, ".//a[starts-with(@href, 'http') and not(contains(@href, 'keep.naver.com'))]/@href", 0
|
|
||||||
)
|
|
||||||
except (ValueError, TypeError, SearxEngineXPathException):
|
except (ValueError, TypeError, SearxEngineXPathException):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
content = extract_text(eval_xpath(item, ".//span[contains(@class, 'sds-comps-text-type-body1')]"))
|
results.add(
|
||||||
|
MainResult(
|
||||||
if title and url:
|
title=extract_text(eval_xpath(item, ".//a[contains(@class, 'link_tit')]")),
|
||||||
results.add(
|
url=eval_xpath_getindex(item, ".//a[contains(@class, 'link_tit')]/@href", 0),
|
||||||
MainResult(
|
content=extract_text(
|
||||||
title=title,
|
eval_xpath(item, ".//div[contains(@class, 'total_dsc_wrap')]//a[contains(@class, 'api_txt_lines')]")
|
||||||
url=url,
|
),
|
||||||
content=content or "",
|
thumbnail=thumbnail,
|
||||||
thumbnail=thumbnail or "",
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
||||||
return results
|
return results
|
||||||
|
|
||||||
@@ -185,7 +173,7 @@ def parse_news(data):
|
|||||||
title=title,
|
title=title,
|
||||||
url=url,
|
url=url,
|
||||||
content=content,
|
content=content,
|
||||||
thumbnail=thumbnail or "",
|
thumbnail=thumbnail,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -208,7 +196,7 @@ def parse_videos(data):
|
|||||||
|
|
||||||
length = None
|
length = None
|
||||||
try:
|
try:
|
||||||
length = parse_duration_string(extract_text(eval_xpath(item, ".//span[contains(@class, 'time')]")) or "")
|
length = parse_duration_string(extract_text(eval_xpath(item, ".//span[contains(@class, 'time')]")))
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -1,66 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Neocities_ is open source software for creating blogs.
|
|
||||||
|
|
||||||
.. _Neocities : https://github.com/neocities/neocities
|
|
||||||
"""
|
|
||||||
|
|
||||||
from urllib.parse import urlencode
|
|
||||||
import typing as t
|
|
||||||
|
|
||||||
from lxml import html
|
|
||||||
|
|
||||||
from searx.utils import eval_xpath, eval_xpath_list, extract_text
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from extended_types import SXNG_Response
|
|
||||||
from search.processors import OnlineParams
|
|
||||||
|
|
||||||
|
|
||||||
# Engine metadata
|
|
||||||
about = {
|
|
||||||
"website": "https://neocities.org/",
|
|
||||||
"wikidata_id": "Q17071099",
|
|
||||||
"official_api_documentation": None,
|
|
||||||
"use_official_api": False,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "HTML",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Engine configuration
|
|
||||||
categories = ["general", "blogs"]
|
|
||||||
paging = True
|
|
||||||
|
|
||||||
# Search URL
|
|
||||||
base_url = "https://neocities.org"
|
|
||||||
|
|
||||||
results_xpath = "//div[@class='result-item']"
|
|
||||||
url_xpath = './/div[@class="result-url"]/a/@href'
|
|
||||||
title_xpath = './/h3[@class="result-title"]/a/text()'
|
|
||||||
content_xpath = './/p[@class="result-snippet"]//text()'
|
|
||||||
screenshot_xpath = './/a[@class="result-screenshot"]/img/@src'
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
|
||||||
query_params: dict[str, t.Any] = {"q": query}
|
|
||||||
if params['pageno'] > 1:
|
|
||||||
offset = (params["pageno"] - 1) * 100
|
|
||||||
query_params["start"] = offset
|
|
||||||
params["url"] = f"{base_url}/search?{urlencode(query_params)}"
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
|
||||||
results = EngineResults()
|
|
||||||
dom = html.fromstring(resp.text)
|
|
||||||
|
|
||||||
for result in eval_xpath_list(dom, results_xpath):
|
|
||||||
results.add(
|
|
||||||
results.types.MainResult(
|
|
||||||
url=extract_text(eval_xpath(result, url_xpath)),
|
|
||||||
title=extract_text(eval_xpath(result, title_xpath)) or "",
|
|
||||||
content=extract_text(eval_xpath(result, content_xpath)) or "",
|
|
||||||
thumbnail=base_url + (extract_text(eval_xpath(result, screenshot_xpath)) or ""),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return results
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Neosearch_ aims to be a privacy-first alternative to Google.
|
|
||||||
|
|
||||||
.. _Neosearch: https://neosearch.org/About
|
|
||||||
"""
|
|
||||||
|
|
||||||
from json import loads
|
|
||||||
import typing as t
|
|
||||||
from urllib.parse import urlencode
|
|
||||||
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.enginelib.traits import EngineTraits
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
traits: EngineTraits
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://neosearch.org",
|
|
||||||
"official_api_documentation": None,
|
|
||||||
"use_official_api": False,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "JSON",
|
|
||||||
}
|
|
||||||
|
|
||||||
base_url = "https://neosearch.org"
|
|
||||||
categories = ["general"]
|
|
||||||
|
|
||||||
paging = False
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams"):
|
|
||||||
args = {"q": query, "generate": "auto"}
|
|
||||||
countrycode = params["searxng_locale"].split("-")[-1].upper()
|
|
||||||
if countrycode in traits.custom["countrycodes"]:
|
|
||||||
args["loc"] = countrycode
|
|
||||||
params["url"] = f"{base_url}/search?{urlencode(args)}"
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
# first line contains something like `{"location": "de"}`
|
|
||||||
# second line contains the actual results
|
|
||||||
json_resp = loads(resp.text.splitlines()[-1])
|
|
||||||
for lens in json_resp["lenses"]:
|
|
||||||
for category in lens["categories"]:
|
|
||||||
for result in category["links"]:
|
|
||||||
if not result["url"]:
|
|
||||||
continue
|
|
||||||
|
|
||||||
res.add(
|
|
||||||
res.types.MainResult(
|
|
||||||
url=result["url"],
|
|
||||||
title=result["title"],
|
|
||||||
content=result["snippet"] or result["description"],
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
for suggestion in json_resp.get("suggestions", []):
|
|
||||||
res.add(res.types.LegacyResult(suggestion=suggestion))
|
|
||||||
|
|
||||||
return res
|
|
||||||
|
|
||||||
|
|
||||||
def fetch_traits(engine_traits: "EngineTraits") -> None:
|
|
||||||
# pylint: disable=import-outside-toplevel
|
|
||||||
from searx.network import get
|
|
||||||
from searx.utils import extr, js_obj_str_to_python
|
|
||||||
from babel.core import get_global
|
|
||||||
|
|
||||||
resp = get(base_url)
|
|
||||||
|
|
||||||
locations_js_raw = extr(resp.text, "const LOCATIONS = ", ";")
|
|
||||||
if not locations_js_raw:
|
|
||||||
raise RuntimeError("failed to find locations in neosearch HTML response")
|
|
||||||
locations: list[dict[str, str]] = js_obj_str_to_python(locations_js_raw)
|
|
||||||
|
|
||||||
babel_reg_list = get_global("territory_languages").keys()
|
|
||||||
|
|
||||||
countrycodes: list[str] = []
|
|
||||||
for loc in locations:
|
|
||||||
_reg = loc["code"].upper()
|
|
||||||
if _reg not in babel_reg_list:
|
|
||||||
print(f"ERROR: region tag {_reg} is unknown by babel")
|
|
||||||
continue
|
|
||||||
countrycodes.append(_reg)
|
|
||||||
|
|
||||||
countrycodes.sort()
|
|
||||||
engine_traits.custom["countrycodes"] = countrycodes
|
|
||||||
@@ -44,7 +44,7 @@ def response(resp) -> EngineResults:
|
|||||||
|
|
||||||
cve_id = item["cve"]["id"]
|
cve_id = item["cve"]["id"]
|
||||||
description = item["cve"]["descriptions"][0]["value"]
|
description = item["cve"]["descriptions"][0]["value"]
|
||||||
date = datetime.fromisoformat(item["cve"]["published"])
|
date = datetime.strptime(item["cve"]["published"], "%Y-%m-%dT%H:%M:%S.%f")
|
||||||
|
|
||||||
# Extract severity (Low, Medium, High, or Critical) and CVSS score, if available
|
# Extract severity (Low, Medium, High, or Critical) and CVSS score, if available
|
||||||
info = item["cve"].get("metrics", {}).get("cvssMetricV31", [{}])[0].get("cvssData", {})
|
info = item["cve"].get("metrics", {}).get("cvssMetricV31", [{}])[0].get("cvssData", {})
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ def response(resp):
|
|||||||
release_time = item["release_time"]
|
release_time = item["release_time"]
|
||||||
duration = item["duration"]
|
duration = item["duration"]
|
||||||
|
|
||||||
release_date = datetime.fromisoformat(release_time.split("T")[0])
|
release_date = datetime.strptime(release_time.split("T")[0], "%Y-%m-%d")
|
||||||
formatted_date = datetime.fromtimestamp(release_date.timestamp())
|
formatted_date = datetime.fromtimestamp(release_date.timestamp())
|
||||||
|
|
||||||
url = f"https://odysee.com/{name}:{claim_id}"
|
url = f"https://odysee.com/{name}:{claim_id}"
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Picjumbo_ provides free stock photos.
|
|
||||||
|
|
||||||
.. _Picjumbo: https://picjumbo.com
|
|
||||||
"""
|
|
||||||
|
|
||||||
from urllib.parse import urlparse, urlunparse
|
|
||||||
import typing as t
|
|
||||||
|
|
||||||
from lxml import html
|
|
||||||
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
from searx.utils import eval_xpath, eval_xpath_list, extract_text
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://picjumbo.com",
|
|
||||||
"wikidata_id": None,
|
|
||||||
"official_api_documentation": None,
|
|
||||||
"use_official_api": False,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "HTML",
|
|
||||||
}
|
|
||||||
|
|
||||||
base_url = "https://picjumbo.com"
|
|
||||||
|
|
||||||
categories = ["images"]
|
|
||||||
paging = True
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
|
||||||
params["url"] = f"{base_url}/search/{query}/page/{params['pageno']}"
|
|
||||||
|
|
||||||
|
|
||||||
def _get_max_res_url(url: str) -> str:
|
|
||||||
"""Get the maximum resolution of the image based on the thumbnail URL."""
|
|
||||||
parsed_url = urlparse(url)
|
|
||||||
max_res_url = parsed_url._replace(query="w=10000&quality=100")
|
|
||||||
return urlunparse(max_res_url)
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response"):
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
doc = html.fromstring(resp.text)
|
|
||||||
|
|
||||||
for result in eval_xpath_list(doc, "//div[contains(@class, 'photo_query')]/div[contains(@class, 'photo_item')]"):
|
|
||||||
thumbnail = extract_text(eval_xpath(result, ".//img[contains(@class, 'image')]/@src")) or ""
|
|
||||||
res.add(
|
|
||||||
res.types.Image(
|
|
||||||
url=extract_text(eval_xpath(result, ".//a[contains(@class, 'image')]/@href")) or "",
|
|
||||||
title=extract_text(eval_xpath(result, ".//h3")) or "",
|
|
||||||
content=extract_text(eval_xpath(result, ".//meta[@itemprop='keywords']/@content")) or "",
|
|
||||||
thumbnail_src=thumbnail,
|
|
||||||
img_src=_get_max_res_url(thumbnail),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return res
|
|
||||||
@@ -54,7 +54,7 @@ def response(resp: "SXNG_Response"):
|
|||||||
title=result["title"],
|
title=result["title"],
|
||||||
content=result["description"],
|
content=result["description"],
|
||||||
thumbnail=result["image_url"],
|
thumbnail=result["image_url"],
|
||||||
publishedDate=datetime.fromisoformat(result["created_at"]),
|
publishedDate=datetime.strptime(result["created_at"], "%Y-%m-%d %H:%M:%S"),
|
||||||
metadata=" | ".join(metadata),
|
metadata=" | ".join(metadata),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
305
searx/engines/presearch.py
Normal file
305
searx/engines/presearch.py
Normal file
@@ -0,0 +1,305 @@
|
|||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
"""Presearch supports the search types listed in :py:obj:`search_type` (general,
|
||||||
|
images, videos, news).
|
||||||
|
|
||||||
|
Configured ``presarch`` engines:
|
||||||
|
|
||||||
|
.. code:: yaml
|
||||||
|
|
||||||
|
- name: presearch
|
||||||
|
engine: presearch
|
||||||
|
search_type: search
|
||||||
|
categories: [general, web]
|
||||||
|
|
||||||
|
- name: presearch images
|
||||||
|
...
|
||||||
|
search_type: images
|
||||||
|
categories: [images, web]
|
||||||
|
|
||||||
|
- name: presearch videos
|
||||||
|
...
|
||||||
|
search_type: videos
|
||||||
|
categories: [general, web]
|
||||||
|
|
||||||
|
- name: presearch news
|
||||||
|
...
|
||||||
|
search_type: news
|
||||||
|
categories: [news, web]
|
||||||
|
|
||||||
|
.. hint::
|
||||||
|
|
||||||
|
By default Presearch's video category is intentionally placed into::
|
||||||
|
|
||||||
|
categories: [general, web]
|
||||||
|
|
||||||
|
|
||||||
|
Search type ``video``
|
||||||
|
=====================
|
||||||
|
|
||||||
|
The results in the video category are most often links to pages that contain a
|
||||||
|
video, for instance many links from Preasearch's video category link content
|
||||||
|
from facebook (aka Meta) or Twitter (aka X). Since these are not real links to
|
||||||
|
video streams SearXNG can't use the video template for this and if SearXNG can't
|
||||||
|
use this template, then the user doesn't want to see these hits in the videos
|
||||||
|
category.
|
||||||
|
|
||||||
|
|
||||||
|
Languages & Regions
|
||||||
|
===================
|
||||||
|
|
||||||
|
In Presearch there are languages for the UI and regions for narrowing down the
|
||||||
|
search. If we set "auto" for the region in the WEB-UI of Presearch and cookie
|
||||||
|
``use_local_search_results=false``, then the defaults are set for both (the
|
||||||
|
language and the region) from the ``Accept-Language`` header.
|
||||||
|
|
||||||
|
Since the region is already "auto" by default, we only need to set the
|
||||||
|
``use_local_search_results`` cookie and send the ``Accept-Language`` header. We
|
||||||
|
have to set these values in both requests we send to Presearch; in the first
|
||||||
|
request to get the request-ID from Presearch and in the final request to get the
|
||||||
|
result list.
|
||||||
|
|
||||||
|
The time format returned by Presearch varies depending on the language set.
|
||||||
|
Multiple different formats can be supported by using ``dateutil`` parser, but
|
||||||
|
it doesn't support formats such as "N time ago", "vor N time" (German),
|
||||||
|
"Hace N time" (Spanish). Because of this, the dates are simply joined together
|
||||||
|
with the rest of other metadata.
|
||||||
|
|
||||||
|
|
||||||
|
Implementations
|
||||||
|
===============
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
from urllib.parse import urlencode, urlparse
|
||||||
|
from searx import locales
|
||||||
|
from searx.network import get
|
||||||
|
from searx.utils import gen_useragent, html_to_text, parse_duration_string
|
||||||
|
|
||||||
|
about = {
|
||||||
|
"website": "https://presearch.io",
|
||||||
|
"wikidata_id": "Q7240905",
|
||||||
|
"official_api_documentation": "https://docs.presearch.io/nodes/api",
|
||||||
|
"use_official_api": False,
|
||||||
|
"require_api_key": False,
|
||||||
|
"results": "JSON",
|
||||||
|
}
|
||||||
|
paging = True
|
||||||
|
safesearch = True
|
||||||
|
time_range_support = True
|
||||||
|
categories = ["general", "web"] # general, images, videos, news
|
||||||
|
|
||||||
|
# HTTP2 requests immediately get blocked by a CAPTCHA
|
||||||
|
enable_http2 = False
|
||||||
|
|
||||||
|
search_type = "search"
|
||||||
|
"""must be any of ``search``, ``images``, ``videos``, ``news``"""
|
||||||
|
|
||||||
|
base_url = "https://presearch.com"
|
||||||
|
safesearch_map = {0: 'false', 1: 'true', 2: 'true'}
|
||||||
|
|
||||||
|
|
||||||
|
def init(_):
|
||||||
|
if search_type not in ['search', 'images', 'videos', 'news']:
|
||||||
|
raise ValueError(f'presearch search_type: {search_type}')
|
||||||
|
|
||||||
|
|
||||||
|
def _get_request_id(query, params):
|
||||||
|
|
||||||
|
args = {
|
||||||
|
"q": query,
|
||||||
|
"page": params["pageno"],
|
||||||
|
}
|
||||||
|
|
||||||
|
if params["time_range"]:
|
||||||
|
args["time"] = params["time_range"]
|
||||||
|
|
||||||
|
url = f"{base_url}/{search_type}?{urlencode(args)}"
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
'User-Agent': gen_useragent(),
|
||||||
|
'Cookie': (
|
||||||
|
f"b=1;"
|
||||||
|
f" presearch_session=;"
|
||||||
|
f" use_local_search_results=false;"
|
||||||
|
f" use_safe_search={safesearch_map[params['safesearch']]}"
|
||||||
|
),
|
||||||
|
}
|
||||||
|
if params['searxng_locale'] != 'all':
|
||||||
|
l = locales.get_locale(params['searxng_locale'])
|
||||||
|
|
||||||
|
# Presearch narrows down the search by region. In SearXNG when the user
|
||||||
|
# does not set a region (e.g. 'en-CA' / canada) we cannot hand over a region.
|
||||||
|
|
||||||
|
# We could possibly use searx.locales.get_official_locales to determine
|
||||||
|
# in which regions this language is an official one, but then we still
|
||||||
|
# wouldn't know which region should be given more weight / Presearch
|
||||||
|
# performs an IP-based geolocation of the user, we don't want that in
|
||||||
|
# SearXNG ;-)
|
||||||
|
|
||||||
|
if l and l.territory:
|
||||||
|
headers['Accept-Language'] = f"{l.language}-{l.territory},{l.language};" "q=0.9,*;" "q=0.5"
|
||||||
|
|
||||||
|
resp = get(url, headers=headers, timeout=5)
|
||||||
|
|
||||||
|
for line in resp.text.split("\n"):
|
||||||
|
if "window.searchId = " in line:
|
||||||
|
return line.split("= ")[1][:-1].replace('"', ""), resp.cookies
|
||||||
|
|
||||||
|
raise RuntimeError("Couldn't find any request id for presearch")
|
||||||
|
|
||||||
|
|
||||||
|
def request(query, params):
|
||||||
|
request_id, cookies = _get_request_id(query, params)
|
||||||
|
params["headers"]["Accept"] = "application/json"
|
||||||
|
params["url"] = f"{base_url}/results?id={request_id}"
|
||||||
|
params["cookies"] = cookies
|
||||||
|
|
||||||
|
return params
|
||||||
|
|
||||||
|
|
||||||
|
def _strip_leading_strings(text):
|
||||||
|
for x in ['wikipedia', 'google']:
|
||||||
|
if text.lower().endswith(x):
|
||||||
|
text = text[: -len(x)]
|
||||||
|
return text.strip()
|
||||||
|
|
||||||
|
|
||||||
|
def _fix_title(title, url):
|
||||||
|
"""
|
||||||
|
Titles from Presearch shows domain + title without spacing, and HTML
|
||||||
|
This function removes these 2 issues.
|
||||||
|
Transforming "translate.google.co.in<em>Google</em> Translate" into "Google Translate"
|
||||||
|
"""
|
||||||
|
parsed_url = urlparse(url)
|
||||||
|
domain = parsed_url.netloc
|
||||||
|
title = html_to_text(title)
|
||||||
|
# Fixes issue where domain would show up in the title
|
||||||
|
# translate.google.co.inGoogle Translate -> Google Translate
|
||||||
|
if (
|
||||||
|
title.startswith(domain)
|
||||||
|
and len(title) > len(domain)
|
||||||
|
and not title.startswith(domain + "/")
|
||||||
|
and not title.startswith(domain + " ")
|
||||||
|
):
|
||||||
|
title = title.removeprefix(domain)
|
||||||
|
return title
|
||||||
|
|
||||||
|
|
||||||
|
def parse_search_query(json_results):
|
||||||
|
results = []
|
||||||
|
if not json_results:
|
||||||
|
return results
|
||||||
|
|
||||||
|
for item in json_results.get('specialSections', {}).get('topStoriesCompact', {}).get('data', []):
|
||||||
|
result = {
|
||||||
|
'url': item['link'],
|
||||||
|
'title': _fix_title(item['title'], item['link']),
|
||||||
|
'thumbnail': item['image'],
|
||||||
|
'content': '',
|
||||||
|
'metadata': item.get('source'),
|
||||||
|
}
|
||||||
|
results.append(result)
|
||||||
|
|
||||||
|
for item in json_results.get('standardResults', []):
|
||||||
|
result = {
|
||||||
|
'url': item['link'],
|
||||||
|
'title': _fix_title(item['title'], item['link']),
|
||||||
|
'content': html_to_text(item['description']),
|
||||||
|
}
|
||||||
|
results.append(result)
|
||||||
|
|
||||||
|
info = json_results.get('infoSection', {}).get('data')
|
||||||
|
if info:
|
||||||
|
attributes = []
|
||||||
|
for item in info.get('about', []):
|
||||||
|
|
||||||
|
text = html_to_text(item)
|
||||||
|
if ':' in text:
|
||||||
|
# split text into key / value
|
||||||
|
label, value = text.split(':', 1)
|
||||||
|
else:
|
||||||
|
# In other languages (tested with zh-TW) a colon is represented
|
||||||
|
# by a different symbol --> then we split at the first space.
|
||||||
|
label, value = text.split(' ', 1)
|
||||||
|
label = label[:-1]
|
||||||
|
|
||||||
|
value = _strip_leading_strings(value)
|
||||||
|
attributes.append({'label': label, 'value': value})
|
||||||
|
content = []
|
||||||
|
for item in [info.get('subtitle'), info.get('description')]:
|
||||||
|
if not item:
|
||||||
|
continue
|
||||||
|
item = _strip_leading_strings(html_to_text(item))
|
||||||
|
if item:
|
||||||
|
content.append(item)
|
||||||
|
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
'infobox': info['title'],
|
||||||
|
'id': info['title'],
|
||||||
|
'img_src': info.get('image'),
|
||||||
|
'content': ' | '.join(content),
|
||||||
|
'attributes': attributes,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
def response(resp):
|
||||||
|
results = []
|
||||||
|
json_resp = resp.json()
|
||||||
|
|
||||||
|
if search_type == 'search':
|
||||||
|
results = parse_search_query(json_resp.get('results', {}))
|
||||||
|
|
||||||
|
elif search_type == 'images':
|
||||||
|
for item in json_resp.get('images', []):
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
'template': 'images.html',
|
||||||
|
'title': html_to_text(item['title']),
|
||||||
|
'url': item.get('link'),
|
||||||
|
'img_src': item.get('image'),
|
||||||
|
'thumbnail_src': item.get('thumbnail'),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
elif search_type == 'videos':
|
||||||
|
# The results in the video category are most often links to pages that contain
|
||||||
|
# a video and not to a video stream --> SearXNG can't use the video template.
|
||||||
|
|
||||||
|
for item in json_resp.get('videos', []):
|
||||||
|
duration = item.get('duration')
|
||||||
|
if duration:
|
||||||
|
duration = parse_duration_string(duration)
|
||||||
|
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
'title': html_to_text(item['title']),
|
||||||
|
'url': item.get('link'),
|
||||||
|
'content': item.get('description', ''),
|
||||||
|
'thumbnail': item.get('image'),
|
||||||
|
'length': duration,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
elif search_type == 'news':
|
||||||
|
for item in json_resp.get('news', []):
|
||||||
|
source = item.get('source')
|
||||||
|
# Bug on their end, time sometimes returns "</a>"
|
||||||
|
time = html_to_text(item.get('time')).strip()
|
||||||
|
metadata = [source]
|
||||||
|
if time != "":
|
||||||
|
metadata.append(time)
|
||||||
|
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
'title': html_to_text(item['title']),
|
||||||
|
'url': item.get('link'),
|
||||||
|
'content': html_to_text(item.get('description', '')),
|
||||||
|
'metadata': ' / '.join(metadata),
|
||||||
|
'thumbnail': item.get('image'),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
return results
|
||||||
@@ -140,7 +140,7 @@ def response(resp):
|
|||||||
results.append(
|
results.append(
|
||||||
{
|
{
|
||||||
'template': 'images.html',
|
'template': 'images.html',
|
||||||
'url': _clean_url(f"{pdia_base_url}/images/{result['objectID']}"),
|
'url': _clean_url(f"{about['website']}/images/{result['objectID']}"),
|
||||||
'img_src': _clean_url(base_image_url),
|
'img_src': _clean_url(base_image_url),
|
||||||
'thumbnail_src': _clean_url(base_image_url + THUMBNAIL_SUFFIX),
|
'thumbnail_src': _clean_url(base_image_url + THUMBNAIL_SUFFIX),
|
||||||
'title': f"{result['title'].strip()} by {result['artist']} {result.get('displayYear', '')}",
|
'title': f"{result['title'].strip()} by {result['artist']} {result.get('displayYear', '')}",
|
||||||
|
|||||||
@@ -292,7 +292,7 @@ def parse_news_uchq(data):
|
|||||||
results = []
|
results = []
|
||||||
for item in data.get('feed', []):
|
for item in data.get('feed', []):
|
||||||
try:
|
try:
|
||||||
published_date = datetime.fromisoformat(item.get('time'))
|
published_date = datetime.strptime(item.get('time'), "%Y-%m-%d")
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
# Sometime Quark will return non-standard format like "1天前", set published_date as None
|
# Sometime Quark will return non-standard format like "1天前", set published_date as None
|
||||||
published_date = None
|
published_date = None
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ Implementations
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import random
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
from datetime import (
|
from datetime import (
|
||||||
@@ -51,7 +50,6 @@ from urllib.parse import urlencode
|
|||||||
import babel
|
import babel
|
||||||
from flask_babel import gettext # pyright: ignore[reportUnknownVariableType]
|
from flask_babel import gettext # pyright: ignore[reportUnknownVariableType]
|
||||||
|
|
||||||
from searx.enginelib import EngineCache
|
|
||||||
from searx.enginelib.traits import EngineTraits
|
from searx.enginelib.traits import EngineTraits
|
||||||
from searx.exceptions import (
|
from searx.exceptions import (
|
||||||
SearxEngineAccessDeniedException,
|
SearxEngineAccessDeniedException,
|
||||||
@@ -91,11 +89,6 @@ qwant_categ: str = None # pyright: ignore[reportAssignmentType]
|
|||||||
|
|
||||||
safesearch = True
|
safesearch = True
|
||||||
|
|
||||||
# tgp seems to be short for "test group" - its actual value doesn't matter, as
|
|
||||||
# long as it's sent and at the correct position in the query params and doesn't
|
|
||||||
# change too frequently
|
|
||||||
test_group_value = random.randint(1, 3)
|
|
||||||
|
|
||||||
# fmt: off
|
# fmt: off
|
||||||
qwant_news_locales = [
|
qwant_news_locales = [
|
||||||
"ca_ad", "ca_es", "ca_fr", "co_fr", "de_at", "de_ch", "de_de", "en_au",
|
"ca_ad", "ca_es", "ca_fr", "co_fr", "de_at", "de_ch", "de_de", "en_au",
|
||||||
@@ -106,19 +99,9 @@ qwant_news_locales = [
|
|||||||
]
|
]
|
||||||
# fmt: on
|
# fmt: on
|
||||||
|
|
||||||
base_url = "https://www.qwant.com"
|
|
||||||
api_url = "https://api.qwant.com/v3/search/"
|
api_url = "https://api.qwant.com/v3/search/"
|
||||||
"""URL of Qwant's API (JSON)"""
|
"""URL of Qwant's API (JSON)"""
|
||||||
|
|
||||||
CACHE: EngineCache
|
|
||||||
"""Cache for storing the ``datadome`` cookie."""
|
|
||||||
|
|
||||||
|
|
||||||
def setup(engine_settings: dict[str, t.Any]) -> bool:
|
|
||||||
global CACHE # pylint: disable=global-statement
|
|
||||||
CACHE = EngineCache(engine_settings["name"])
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
def request(query: str, params: "OnlineParams") -> None:
|
||||||
"""Qwant search request"""
|
"""Qwant search request"""
|
||||||
@@ -131,38 +114,26 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
results_per_page = 10
|
results_per_page = 10
|
||||||
if qwant_categ == "images":
|
if qwant_categ == "images":
|
||||||
results_per_page = 50
|
results_per_page = 50
|
||||||
|
|
||||||
args = {
|
args = {
|
||||||
"q": query,
|
"q": query,
|
||||||
"count": results_per_page,
|
"count": results_per_page,
|
||||||
"locale": q_locale,
|
"locale": q_locale,
|
||||||
"offset": (params["pageno"] - 1) * results_per_page,
|
"offset": (params["pageno"] - 1) * results_per_page,
|
||||||
"tgp": test_group_value,
|
|
||||||
"device": "desktop",
|
"device": "desktop",
|
||||||
"safesearch": params["safesearch"],
|
"safesearch": params["safesearch"],
|
||||||
# True would be encoded to "True", instead of "true", which makes the request
|
"tgp": 1,
|
||||||
# easier to detect and block
|
"display": True,
|
||||||
"displayed": "true",
|
"llm": True,
|
||||||
"llm": "true",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
params["raise_for_httperror"] = False
|
params["raise_for_httperror"] = False
|
||||||
|
|
||||||
params["url"] = f"{api_url}{qwant_categ}?{urlencode(args)}"
|
params["url"] = f"{api_url}{qwant_categ}?{urlencode(args)}"
|
||||||
|
|
||||||
params["cookies"]["datadome"] = CACHE.get("datadome")
|
|
||||||
params["headers"].update({"Accept": "application/json", "Referer": f"{base_url}/", "Origin": base_url})
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
def response(resp: "SXNG_Response") -> EngineResults:
|
||||||
"""Parse results from Qwant's API"""
|
"""Parse results from Qwant's API"""
|
||||||
# pylint: disable=too-many-locals, too-many-branches, too-many-statements
|
# pylint: disable=too-many-locals, too-many-branches, too-many-statements
|
||||||
|
|
||||||
# cache datadome cookie - changes on each request
|
|
||||||
datadome = resp.cookies.get("datadome")
|
|
||||||
if datadome:
|
|
||||||
CACHE.set("datadome", datadome)
|
|
||||||
|
|
||||||
res = EngineResults()
|
res = EngineResults()
|
||||||
|
|
||||||
# Try to load JSON result
|
# Try to load JSON result
|
||||||
@@ -179,8 +150,8 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
error_code = data.get("error_code")
|
error_code = data.get("error_code")
|
||||||
if error_code == 24:
|
if error_code == 24:
|
||||||
raise SearxEngineTooManyRequestsException()
|
raise SearxEngineTooManyRequestsException()
|
||||||
if search_results.get("url") is not None:
|
if search_results.get("data", {}).get("error_data", {}).get("captchaUrl") is not None:
|
||||||
raise SearxEngineCaptchaException(suspended_time=0)
|
raise SearxEngineCaptchaException()
|
||||||
if resp.status_code == 403:
|
if resp.status_code == 403:
|
||||||
raise SearxEngineAccessDeniedException()
|
raise SearxEngineAccessDeniedException()
|
||||||
msg = ",".join(data.get("message", ["unknown"]))
|
msg = ",".join(data.get("message", ["unknown"]))
|
||||||
@@ -219,6 +190,7 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
|
|
||||||
mainline_items: list[dict[str, t.Any]] = row.get("items", [])
|
mainline_items: list[dict[str, t.Any]] = row.get("items", [])
|
||||||
for item in mainline_items:
|
for item in mainline_items:
|
||||||
|
|
||||||
title: str = item.get("title", "")
|
title: str = item.get("title", "")
|
||||||
res_url: str = item.get("url", "")
|
res_url: str = item.get("url", "")
|
||||||
pub_date: datetime | None = None
|
pub_date: datetime | None = None
|
||||||
@@ -318,7 +290,7 @@ def fetch_traits(engine_traits: EngineTraits):
|
|||||||
from searx.utils import extr
|
from searx.utils import extr
|
||||||
|
|
||||||
resp = get(
|
resp = get(
|
||||||
base_url, # pyright: ignore[reportArgumentType]
|
about["website"], # pyright: ignore[reportArgumentType]
|
||||||
timeout=5,
|
timeout=5,
|
||||||
)
|
)
|
||||||
if not resp.ok:
|
if not resp.ok:
|
||||||
|
|||||||
74
searx/engines/reddit.py
Normal file
74
searx/engines/reddit.py
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
"""Reddit"""
|
||||||
|
|
||||||
|
import json
|
||||||
|
from datetime import datetime
|
||||||
|
from urllib.parse import urlencode, urljoin, urlparse
|
||||||
|
|
||||||
|
# about
|
||||||
|
about = {
|
||||||
|
"website": 'https://www.reddit.com/',
|
||||||
|
"wikidata_id": 'Q1136',
|
||||||
|
"official_api_documentation": 'https://www.reddit.com/dev/api',
|
||||||
|
"use_official_api": True,
|
||||||
|
"require_api_key": False,
|
||||||
|
"results": 'JSON',
|
||||||
|
}
|
||||||
|
|
||||||
|
# engine dependent config
|
||||||
|
categories = ['social media']
|
||||||
|
page_size = 25
|
||||||
|
|
||||||
|
# search-url
|
||||||
|
base_url = 'https://www.reddit.com/'
|
||||||
|
search_url = base_url + 'search.json?{query}'
|
||||||
|
|
||||||
|
|
||||||
|
def request(query, params):
|
||||||
|
|
||||||
|
query = urlencode({'q': query, 'limit': page_size})
|
||||||
|
params['url'] = search_url.format(query=query)
|
||||||
|
|
||||||
|
return params
|
||||||
|
|
||||||
|
|
||||||
|
def response(resp):
|
||||||
|
|
||||||
|
img_results = []
|
||||||
|
text_results = []
|
||||||
|
|
||||||
|
search_results = json.loads(resp.text)
|
||||||
|
|
||||||
|
# return empty array if there are no results
|
||||||
|
if 'data' not in search_results:
|
||||||
|
return []
|
||||||
|
|
||||||
|
posts = search_results.get('data', {}).get('children', [])
|
||||||
|
|
||||||
|
# process results
|
||||||
|
for post in posts:
|
||||||
|
data = post['data']
|
||||||
|
|
||||||
|
# extract post information
|
||||||
|
params = {'url': urljoin(base_url, data['permalink']), 'title': data['title']}
|
||||||
|
|
||||||
|
# if thumbnail field contains a valid URL, we need to change template
|
||||||
|
thumbnail = data['thumbnail']
|
||||||
|
url_info = urlparse(thumbnail)
|
||||||
|
# netloc & path
|
||||||
|
if url_info[1] != '' and url_info[2] != '':
|
||||||
|
params['img_src'] = data['url']
|
||||||
|
params['thumbnail_src'] = thumbnail
|
||||||
|
params['template'] = 'images.html'
|
||||||
|
img_results.append(params)
|
||||||
|
else:
|
||||||
|
created = datetime.fromtimestamp(data['created_utc'])
|
||||||
|
content = data['selftext']
|
||||||
|
if len(content) > 500:
|
||||||
|
content = content[:500] + '...'
|
||||||
|
params['content'] = content
|
||||||
|
params['publishedDate'] = created
|
||||||
|
text_results.append(params)
|
||||||
|
|
||||||
|
# show images first and text results second
|
||||||
|
return img_results + text_results
|
||||||
@@ -101,7 +101,7 @@ def _image_results(doc: "ElementBase") -> EngineResults:
|
|||||||
res.types.Image(
|
res.types.Image(
|
||||||
url=extract_text(eval_xpath(result, "./@href")) or "",
|
url=extract_text(eval_xpath(result, "./@href")) or "",
|
||||||
title=extract_text(eval_xpath(result, "./img/@alt")) or "",
|
title=extract_text(eval_xpath(result, "./img/@alt")) or "",
|
||||||
img_src=extract_text(eval_xpath(result, "./img/@src")) or "",
|
thumbnail_src=extract_text(eval_xpath(result, "./img/@src")) or "",
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ def response(resp):
|
|||||||
title = extract_text(result_dom.xpath(title_xpath))
|
title = extract_text(result_dom.xpath(title_xpath))
|
||||||
p_date = extract_text(result_dom.xpath(published_date))
|
p_date = extract_text(result_dom.xpath(published_date))
|
||||||
# fix offset date for line 644 webapp.py check
|
# fix offset date for line 644 webapp.py check
|
||||||
fixed_date = datetime.fromisoformat(p_date)
|
fixed_date = datetime.strptime(p_date, '%Y-%m-%dT%H:%M:%S%z')
|
||||||
earned = extract_text(result_dom.xpath(earned_xpath))
|
earned = extract_text(result_dom.xpath(earned_xpath))
|
||||||
views = extract_text(result_dom.xpath(views_xpath))
|
views = extract_text(result_dom.xpath(views_xpath))
|
||||||
rumbles = extract_text(result_dom.xpath(rumbles_xpath))
|
rumbles = extract_text(result_dom.xpath(rumbles_xpath))
|
||||||
|
|||||||
@@ -1,96 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""SearchZee is a small, indie project, web and news results pulled from
|
|
||||||
independent search infrastructure."""
|
|
||||||
|
|
||||||
import typing as t
|
|
||||||
from urllib.parse import urlencode
|
|
||||||
|
|
||||||
from searx.exceptions import SearxEngineAPIException
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.network import get
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
from searx.utils import extr, html_to_text
|
|
||||||
from searx.enginelib import EngineCache
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://searchzee.com",
|
|
||||||
"official_api_documentation": None,
|
|
||||||
"use_official_api": False,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "JSON",
|
|
||||||
"description": (
|
|
||||||
"SearchZee is a small, indie project, the web and news results"
|
|
||||||
" are pulled from an independent search infrastructure."
|
|
||||||
),
|
|
||||||
}
|
|
||||||
categories: list[str] = None # type: ignore[reportAssignmentType]
|
|
||||||
|
|
||||||
paging = True
|
|
||||||
|
|
||||||
SearchzeeCategType = t.Literal["web", "news"]
|
|
||||||
searchzee_categ: SearchzeeCategType = None # type: ignore[reportAssignmentType]
|
|
||||||
|
|
||||||
|
|
||||||
CACHE: EngineCache
|
|
||||||
"""Cache for storing the scraped API Token."""
|
|
||||||
|
|
||||||
base_url = "https://searchzee.com"
|
|
||||||
|
|
||||||
# only supports for news
|
|
||||||
time_range_map = {"day": "pd", "week": "pw", "month": "pm", "year": "py"}
|
|
||||||
|
|
||||||
|
|
||||||
def setup(engine_settings: dict[str, t.Any]) -> bool:
|
|
||||||
if searchzee_categ not in t.get_args(SearchzeeCategType):
|
|
||||||
raise ValueError("invalid category: %s" % searchzee_categ)
|
|
||||||
|
|
||||||
global CACHE # pylint: disable=global-statement
|
|
||||||
CACHE = EngineCache(engine_settings["name"]) # type: ignore[reportAny]
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def _obtain_api_token() -> str:
|
|
||||||
token: str | None = CACHE.get("token") # type: ignore[reportAny]
|
|
||||||
if token:
|
|
||||||
return token
|
|
||||||
|
|
||||||
token_resp = get(
|
|
||||||
f"{base_url}/app.js",
|
|
||||||
)
|
|
||||||
if not token_resp.ok:
|
|
||||||
raise SearxEngineAPIException("failed to obtain api key")
|
|
||||||
|
|
||||||
token = extr(token_resp.text, "const SEARCHZEE_API_TOKEN = \"", "\";")
|
|
||||||
CACHE.set("token", token, expire=3600)
|
|
||||||
|
|
||||||
return token
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams"):
|
|
||||||
params["headers"]["X-SearchZee-Token"] = _obtain_api_token()
|
|
||||||
|
|
||||||
args = {"q": query, "type": searchzee_categ, "offset": params["pageno"] - 1}
|
|
||||||
if params["time_range"]:
|
|
||||||
args["freshness"] = time_range_map[params["time_range"]]
|
|
||||||
params["url"] = f"{base_url}/api/search?{urlencode(args)}"
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
results: list[dict[str, str]] = resp.json()["results"] # type: ignore[reportAny]
|
|
||||||
|
|
||||||
for result in results:
|
|
||||||
res.add(
|
|
||||||
res.types.MainResult(
|
|
||||||
url=result["url"],
|
|
||||||
title=html_to_text(result["title"]),
|
|
||||||
content=html_to_text(result["summary"]),
|
|
||||||
thumbnail=result.get("thumbnail") or "",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return res
|
|
||||||
@@ -120,7 +120,7 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
|
|
||||||
publishedDate: datetime | None
|
publishedDate: datetime | None
|
||||||
if "pubDate" in result:
|
if "pubDate" in result:
|
||||||
publishedDate = datetime.fromisoformat(result["pubDate"])
|
publishedDate = datetime.strptime(result["pubDate"], "%Y-%m-%d")
|
||||||
else:
|
else:
|
||||||
publishedDate = None
|
publishedDate = None
|
||||||
|
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Shopify stock photos provides royalty-free images, intended for use with
|
|
||||||
Shopify.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import typing as t
|
|
||||||
from urllib.parse import urlencode
|
|
||||||
|
|
||||||
from lxml import html
|
|
||||||
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
from searx.utils import eval_xpath, eval_xpath_list, extract_text
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://www.shopify.com/stock-photos",
|
|
||||||
"wikidata_id": None,
|
|
||||||
"official_api_documentation": None,
|
|
||||||
"use_official_api": False,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "HTML",
|
|
||||||
}
|
|
||||||
|
|
||||||
base_url = "https://www.shopify.com"
|
|
||||||
|
|
||||||
categories = ["images"]
|
|
||||||
paging = True
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
|
||||||
args = {"q": query, "page": params["pageno"]}
|
|
||||||
params["url"] = f"{base_url}/stock-photos/photos/search?{urlencode(args)}"
|
|
||||||
|
|
||||||
|
|
||||||
def _get_download_url(url: str) -> str:
|
|
||||||
"""Get the link to the full quality image."""
|
|
||||||
query_start = url.find("?")
|
|
||||||
return url[:query_start] + "/download?quality=premium"
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response"):
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
doc = html.fromstring(resp.text)
|
|
||||||
|
|
||||||
for result in eval_xpath_list(doc, "//div[contains(@class, 'js-masonry-grid')]/div"):
|
|
||||||
url = base_url + (extract_text(eval_xpath(result, ".//a[contains(@class, 'photo-tile')]/@href")) or "")
|
|
||||||
res.add(
|
|
||||||
res.types.Image(
|
|
||||||
url=url,
|
|
||||||
title=extract_text(eval_xpath(result, ".//p[contains(@class, 'photo-tile__title')]")) or "",
|
|
||||||
thumbnail_src=extract_text(eval_xpath(result, ".//img[contains(@class, 'photo-card__image')]/@src"))
|
|
||||||
or "",
|
|
||||||
img_src=_get_download_url(url),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return res
|
|
||||||
@@ -95,8 +95,7 @@ def _parse_date(text):
|
|||||||
date_match = re.search(r"(\d{4}-\d{1,2}-\d{1,2})", text)
|
date_match = re.search(r"(\d{4}-\d{1,2}-\d{1,2})", text)
|
||||||
if date_match:
|
if date_match:
|
||||||
try:
|
try:
|
||||||
y, m, d = date_match.group(1).split("-")
|
return datetime.strptime(date_match.group(1), "%Y-%m-%d")
|
||||||
return datetime(year=int(y), month=int(m), day=int(d))
|
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
pass
|
pass
|
||||||
return None
|
return None
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ def response(resp):
|
|||||||
published_date = None
|
published_date = None
|
||||||
if entry.get("date") and entry.get("duration"):
|
if entry.get("date") and entry.get("duration"):
|
||||||
try:
|
try:
|
||||||
published_date = datetime.fromisoformat(entry['date'])
|
published_date = datetime.strptime(entry['date'], "%Y-%m-%d")
|
||||||
except (ValueError, TypeError):
|
except (ValueError, TypeError):
|
||||||
published_date = None
|
published_date = None
|
||||||
|
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
return str(record.get(k, ""))
|
return str(record.get(k, ""))
|
||||||
|
|
||||||
for record in json_data["records"]:
|
for record in json_data["records"]:
|
||||||
published = datetime.fromisoformat(record["publicationDate"])
|
published = datetime.strptime(record["publicationDate"], "%Y-%m-%d")
|
||||||
authors: list[str] = [" ".join(author["creator"].split(", ")[::-1]) for author in record["creators"]]
|
authors: list[str] = [" ".join(author["creator"].split(", ")[::-1]) for author in record["creators"]]
|
||||||
|
|
||||||
pdf_url = ""
|
pdf_url = ""
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
||||||
"""Stocksnap_ is a search engine for CC0-licensed images.
|
|
||||||
|
|
||||||
.. _Stocksnap: https://stocksnap.io
|
|
||||||
"""
|
|
||||||
|
|
||||||
import typing as t
|
|
||||||
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
|
||||||
from searx.extended_types import SXNG_Response
|
|
||||||
from searx.search.processors import OnlineParams
|
|
||||||
|
|
||||||
|
|
||||||
about = {
|
|
||||||
"website": "https://stocksnap.io",
|
|
||||||
"wikidata_id": None,
|
|
||||||
"official_api_documentation": None,
|
|
||||||
"use_official_api": False,
|
|
||||||
"require_api_key": False,
|
|
||||||
"results": "JSON",
|
|
||||||
}
|
|
||||||
# otherwise all requests get blocked, probably HTTP2 fingerprinting
|
|
||||||
enable_http2 = False
|
|
||||||
|
|
||||||
base_url = "https://stocksnap.io"
|
|
||||||
cdn_url = "https://cdn.stocksnap.io"
|
|
||||||
|
|
||||||
categories = ["images"]
|
|
||||||
paging = True
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
|
||||||
params["url"] = f"{base_url}/api/search-photos/{query}/relevance/desc/{params['pageno']}"
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response"):
|
|
||||||
res = EngineResults()
|
|
||||||
|
|
||||||
result: dict[str, str] # TBH: dict[str, t.Any]
|
|
||||||
for result in resp.json()["results"]:
|
|
||||||
slug = "-".join(result['keywords'][:1]) + "-" + result["img_id"]
|
|
||||||
res.add(
|
|
||||||
res.types.Image(
|
|
||||||
title=result["tags"],
|
|
||||||
url=f"{base_url}/photo/{slug}",
|
|
||||||
thumbnail_src=f"{cdn_url}/img-thumbs/280h/{result['img_id']}.jpg",
|
|
||||||
img_src=f"{cdn_url}/img-thumbs/960w/{result['img_id']}.jpg",
|
|
||||||
img_format="JPEG",
|
|
||||||
resolution=f"{result['img_width']}x{result['img_height']}",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return res
|
|
||||||
@@ -9,7 +9,6 @@ import codecs
|
|||||||
import hashlib
|
import hashlib
|
||||||
import json
|
import json
|
||||||
import random
|
import random
|
||||||
import string
|
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
@@ -44,8 +43,8 @@ paging = True
|
|||||||
|
|
||||||
base_url = "https://api.swisscows.com"
|
base_url = "https://api.swisscows.com"
|
||||||
|
|
||||||
CAESAR_ALPHABET = string.ascii_uppercase
|
CAESAR_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||||
NONCE_ALPHABET = string.ascii_letters + string.digits + "-._~"
|
NONCE_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"
|
||||||
|
|
||||||
time_range_map = {"day": "Day", "week": "Week", "month": "Month", "year": "Year"}
|
time_range_map = {"day": "Day", "week": "Week", "month": "Month", "year": "Year"}
|
||||||
|
|
||||||
@@ -93,7 +92,7 @@ def generate_nonce(length: int = 32) -> str:
|
|||||||
"""
|
"""
|
||||||
Generate a random char sequence with the given length.
|
Generate a random char sequence with the given length.
|
||||||
"""
|
"""
|
||||||
return "".join(random.choices(NONCE_ALPHABET, k=length))
|
return "".join([random.choice(NONCE_ALPHABET) for _ in range(length)])
|
||||||
|
|
||||||
|
|
||||||
def caesar_shift_with_switch_case(s: str, offset: int = 13) -> str:
|
def caesar_shift_with_switch_case(s: str, offset: int = 13) -> str:
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ def _story(item):
|
|||||||
return {
|
return {
|
||||||
'title': item['title'],
|
'title': item['title'],
|
||||||
'thumbnail': item.get('teaserImage', {}).get('imageVariants', {}).get('16x9-256'),
|
'thumbnail': item.get('teaserImage', {}).get('imageVariants', {}).get('16x9-256'),
|
||||||
'publishedDate': datetime.fromisoformat(item['date'][:19]),
|
'publishedDate': datetime.strptime(item['date'][:19], '%Y-%m-%dT%H:%M:%S'),
|
||||||
'content': item.get('firstSentence'),
|
'content': item.get('firstSentence'),
|
||||||
'url': item['shareURL'] if use_source_url else item['detailsweb'],
|
'url': item['shareURL'] if use_source_url else item['detailsweb'],
|
||||||
}
|
}
|
||||||
@@ -103,7 +103,7 @@ def _video(item):
|
|||||||
'template': 'videos.html',
|
'template': 'videos.html',
|
||||||
'title': title,
|
'title': title,
|
||||||
'thumbnail': item.get('teaserImage', {}).get('imageVariants', {}).get('16x9-256'),
|
'thumbnail': item.get('teaserImage', {}).get('imageVariants', {}).get('16x9-256'),
|
||||||
'publishedDate': datetime.fromisoformat(item['date'][:19]),
|
'publishedDate': datetime.strptime(item['date'][:19], '%Y-%m-%dT%H:%M:%S'),
|
||||||
'content': item.get('firstSentence', ''),
|
'content': item.get('firstSentence', ''),
|
||||||
'iframe_src': video_url,
|
'iframe_src': video_url,
|
||||||
'url': url,
|
'url': url,
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ def _obtain_session_code() -> str:
|
|||||||
if cached_session:
|
if cached_session:
|
||||||
return cached_session
|
return cached_session
|
||||||
|
|
||||||
results_page = get(f"{base_url}/checkCode.aspx")
|
results_page = get(f"{base_url}/_internCode.aspx")
|
||||||
doc = html.fromstring(results_page.text)
|
doc = html.fromstring(results_page.text)
|
||||||
|
|
||||||
extra_data: dict[str, str] = {}
|
extra_data: dict[str, str] = {}
|
||||||
@@ -107,7 +107,7 @@ def _obtain_session_code() -> str:
|
|||||||
}
|
}
|
||||||
|
|
||||||
challenge_response = post(
|
challenge_response = post(
|
||||||
f"{base_url}/checkCode.aspx",
|
f"{base_url}/_internCode.aspx",
|
||||||
cookies=results_page.cookies,
|
cookies=results_page.cookies,
|
||||||
data=data,
|
data=data,
|
||||||
)
|
)
|
||||||
@@ -117,7 +117,7 @@ def _obtain_session_code() -> str:
|
|||||||
if not code:
|
if not code:
|
||||||
raise SearxEngineAPIException("failed to obtain session code")
|
raise SearxEngineAPIException("failed to obtain session code")
|
||||||
|
|
||||||
CACHE.set("session", code, expire=60 * 24 * 60 * 60) # cookie is valid for two months
|
CACHE.set("session", code, expire=60 * 24 * 60) # cookie is valid for two months
|
||||||
return code
|
return code
|
||||||
|
|
||||||
|
|
||||||
@@ -125,9 +125,7 @@ def request(query: str, params: "OnlineParams"):
|
|||||||
code = _obtain_session_code()
|
code = _obtain_session_code()
|
||||||
args = {"w": query, "page": params["pageno"]}
|
args = {"w": query, "page": params["pageno"]}
|
||||||
params["url"] = f"{base_url}/{tiger_category}?{urlencode(args)}"
|
params["url"] = f"{base_url}/{tiger_category}?{urlencode(args)}"
|
||||||
# Setting Checked=1 shows related search terms / suggestions
|
params["cookies"]["Tiger.ch"] = f"Code={code}"
|
||||||
# Language and country could be set with Lng= and Land= in the future
|
|
||||||
params["cookies"]["Tiger.ch"] = f"Tiger.ch=&Code={code}&Checked=1"
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
def response(resp: "SXNG_Response") -> EngineResults:
|
||||||
@@ -146,9 +144,6 @@ def response(resp: "SXNG_Response") -> EngineResults:
|
|||||||
content=extract_text(eval_xpath(result, ".//*[contains(@class, 'webbodynopic')]")) or "",
|
content=extract_text(eval_xpath(result, ".//*[contains(@class, 'webbodynopic')]")) or "",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
for suggestion in eval_xpath_list(doc, "//a[contains(@class, 'linkAnders')]"):
|
|
||||||
res.add(res.types.LegacyResult(suggestion=extract_text(suggestion)))
|
|
||||||
elif tiger_category == "News":
|
elif tiger_category == "News":
|
||||||
for result in eval_xpath_list(doc, "//div[@id='panNews']/div"):
|
for result in eval_xpath_list(doc, "//div[@id='panNews']/div"):
|
||||||
publishedDate = None
|
publishedDate = None
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ def parse_tineye_match(match_json):
|
|||||||
|
|
||||||
crawl_date = backlink_json.get("crawl_date")
|
crawl_date = backlink_json.get("crawl_date")
|
||||||
if crawl_date:
|
if crawl_date:
|
||||||
crawl_date = datetime.fromisoformat(crawl_date)
|
crawl_date = datetime.strptime(crawl_date, '%Y-%m-%d')
|
||||||
else:
|
else:
|
||||||
crawl_date = datetime.min
|
crawl_date = datetime.min
|
||||||
|
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ def response(resp):
|
|||||||
'title': title,
|
'title': title,
|
||||||
'content': html_to_text(result['content']),
|
'content': html_to_text(result['content']),
|
||||||
'thumbnail': thumbnail,
|
'thumbnail': thumbnail,
|
||||||
'publishedDate': datetime.fromisoformat(result['created_at']),
|
'publishedDate': datetime.strptime(result['created_at'], '%Y-%m-%d %H:%M:%S'),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from dateutil import parser
|
|||||||
|
|
||||||
from searx.exceptions import SearxEngineAPIException
|
from searx.exceptions import SearxEngineAPIException
|
||||||
from searx.network import get
|
from searx.network import get
|
||||||
from searx.utils import gen_useragent, html_to_text
|
from searx.utils import html_to_text
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
@@ -52,7 +52,7 @@ def _obtain_x_sid() -> tuple[str, str]:
|
|||||||
The header key is usually called `x-sid-{UUIDv4}`, and the value is
|
The header key is usually called `x-sid-{UUIDv4}`, and the value is
|
||||||
usually a plain UUIDv4 (but a different one than in the header key).
|
usually a plain UUIDv4 (but a different one than in the header key).
|
||||||
"""
|
"""
|
||||||
resp = get(f"{api_url}/revcontent/embed.js", headers={"User-Agent": gen_useragent()})
|
resp = get(f"{api_url}/revcontent/embed.js")
|
||||||
if not resp.ok:
|
if not resp.ok:
|
||||||
raise SearxEngineAPIException("failed to obtain request x-sid token")
|
raise SearxEngineAPIException("failed to obtain request x-sid token")
|
||||||
|
|
||||||
@@ -89,14 +89,12 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
params["url"] = f"{api_url}/Search/Web?{urlencode(args)}"
|
params["url"] = f"{api_url}/Search/Web?{urlencode(args)}"
|
||||||
|
|
||||||
x_sid_header, x_sid_value = _obtain_x_sid()
|
x_sid_header, x_sid_value = _obtain_x_sid()
|
||||||
params["headers"].update(
|
params["headers"] = {
|
||||||
{
|
x_sid_header: x_sid_value,
|
||||||
x_sid_header: x_sid_value,
|
# required - we send a random longitude and latitude instead of the actual user location
|
||||||
# required - we send a random longitude and latitude instead of the actual user location
|
'x-lon': str(random.random() * 90),
|
||||||
"x-lon": str(round(random.random() * 90, 4)),
|
'x-lat': str(random.random() * 90),
|
||||||
"x-lat": str(round(random.random() * 90, 4)),
|
}
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response"):
|
def response(resp: "SXNG_Response"):
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ def response(resp):
|
|||||||
'img_src': result['path'],
|
'img_src': result['path'],
|
||||||
'thumbnail_src': result['thumbs']['small'],
|
'thumbnail_src': result['thumbs']['small'],
|
||||||
'resolution': result['resolution'].replace('x', ' x '),
|
'resolution': result['resolution'].replace('x', ' x '),
|
||||||
'publishedDate': datetime.fromisoformat(result['created_at']),
|
'publishedDate': datetime.strptime(result['created_at'], '%Y-%m-%d %H:%M:%S'),
|
||||||
'img_format': result['file_type'],
|
'img_format': result['file_type'],
|
||||||
'filesize': humanize_bytes(result['file_size']),
|
'filesize': humanize_bytes(result['file_size']),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ cfg_schema = 1 # config's schema version no.
|
|||||||
# "duckduckgo" = "searx.favicons.resolvers.duckduckgo"
|
# "duckduckgo" = "searx.favicons.resolvers.duckduckgo"
|
||||||
# "allesedv" = "searx.favicons.resolvers.allesedv"
|
# "allesedv" = "searx.favicons.resolvers.allesedv"
|
||||||
# "google" = "searx.favicons.resolvers.google"
|
# "google" = "searx.favicons.resolvers.google"
|
||||||
# "kagi" = "searx.favicons.resolvers.kagi"
|
|
||||||
# "yandex" = "searx.favicons.resolvers.yandex"
|
# "yandex" = "searx.favicons.resolvers.yandex"
|
||||||
|
|
||||||
[favicons.cache]
|
[favicons.cache]
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ timeout``) and returns a tuple ``(data, mime)``.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["DEFAULT_RESOLVER_MAP", "allesedv", "duckduckgo", "google", "kagi", "yandex"]
|
__all__ = ["DEFAULT_RESOLVER_MAP", "allesedv", "duckduckgo", "google", "yandex"]
|
||||||
|
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
from searx import network
|
from searx import network
|
||||||
@@ -76,21 +76,6 @@ def google(domain: str, timeout: int) -> tuple[None | bytes, None | str]:
|
|||||||
return data, mime
|
return data, mime
|
||||||
|
|
||||||
|
|
||||||
def kagi(domain: str, timeout: int) -> tuple[None | bytes, None | str]:
|
|
||||||
"""Favicon Resolver from kagi.com / https://news.kagi.com/api/favicon-proxy"""
|
|
||||||
data, mime = (None, None)
|
|
||||||
# quality can be either 'fast' or 'best', best is slower and can return svgs (e.g. github.com)
|
|
||||||
url = f"https://news.kagi.com/api/favicon-proxy?domain={domain}&quality=fast"
|
|
||||||
logger.debug("fetch favicon from: %s", url)
|
|
||||||
|
|
||||||
# will return a 404 if the favicon does not exist and a 200 if it does,
|
|
||||||
response = network.get(url, **_req_args(timeout=timeout))
|
|
||||||
if response and response.status_code == 200:
|
|
||||||
mime = response.headers['Content-Type']
|
|
||||||
data = response.content
|
|
||||||
return data, mime
|
|
||||||
|
|
||||||
|
|
||||||
def yandex(domain: str, timeout: int) -> tuple[None | bytes, None | str]:
|
def yandex(domain: str, timeout: int) -> tuple[None | bytes, None | str]:
|
||||||
"""Favicon Resolver from yandex.com"""
|
"""Favicon Resolver from yandex.com"""
|
||||||
data, mime = (None, None)
|
data, mime = (None, None)
|
||||||
@@ -110,6 +95,5 @@ DEFAULT_RESOLVER_MAP = {
|
|||||||
"allesedv": allesedv,
|
"allesedv": allesedv,
|
||||||
"duckduckgo": duckduckgo,
|
"duckduckgo": duckduckgo,
|
||||||
"google": google,
|
"google": google,
|
||||||
"kagi": kagi,
|
|
||||||
"yandex": yandex,
|
"yandex": yandex,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,12 +52,6 @@ def _normalize_url_fields(result: "Result | LegacyResult"):
|
|||||||
result.parsed_url = urllib.parse.urlparse(result.url)
|
result.parsed_url = urllib.parse.urlparse(result.url)
|
||||||
|
|
||||||
if result.parsed_url:
|
if result.parsed_url:
|
||||||
# properly format special characters (e.g. "ä", "ö") in IDN domains
|
|
||||||
# e.g. "xn--strung-xxa.de" becomes "störung.de"
|
|
||||||
if result.parsed_url.netloc.startswith("xn--"):
|
|
||||||
netloc = result.parsed_url.netloc.encode().decode("idna")
|
|
||||||
result.parsed_url = result.parsed_url._replace(netloc=netloc)
|
|
||||||
|
|
||||||
result.parsed_url = result.parsed_url._replace(
|
result.parsed_url = result.parsed_url._replace(
|
||||||
# if the result has no scheme, use http as default
|
# if the result has no scheme, use http as default
|
||||||
scheme=result.parsed_url.scheme or "http",
|
scheme=result.parsed_url.scheme or "http",
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ __all__ = [
|
|||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
import os
|
|
||||||
from searx import logger
|
from searx import logger
|
||||||
from searx import engines
|
from searx import engines
|
||||||
|
|
||||||
@@ -93,9 +92,7 @@ class ProcessorMap(dict[str, EngineProcessor]):
|
|||||||
self[eng_proc.engine.name] = eng_proc
|
self[eng_proc.engine.name] = eng_proc
|
||||||
# logger.debug("registered engine processor: %s", eng_proc.engine.name)
|
# logger.debug("registered engine processor: %s", eng_proc.engine.name)
|
||||||
else:
|
else:
|
||||||
logger.error(
|
logger.error("can't register engine processor: %s (init failed)", eng_proc.engine.name)
|
||||||
f"(PID {os.getpid()}) {eng_proc.engine.name}: can't register engines processor (init engine failed)"
|
|
||||||
)
|
|
||||||
|
|
||||||
return eng_proc_ok
|
return eng_proc_ok
|
||||||
|
|
||||||
|
|||||||
@@ -150,26 +150,19 @@ class EngineProcessor(ABC):
|
|||||||
threading.Thread(target=__init_processor_thread, daemon=True).start()
|
threading.Thread(target=__init_processor_thread, daemon=True).start()
|
||||||
|
|
||||||
def init_engine(self) -> bool:
|
def init_engine(self) -> bool:
|
||||||
|
|
||||||
eng_setting = get_engine_from_settings(self.engine.name)
|
eng_setting = get_engine_from_settings(self.engine.name)
|
||||||
init_ok: bool | None = False
|
init_ok: bool | None = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
init_ok = self.engine.init(eng_setting)
|
init_ok = self.engine.init(eng_setting)
|
||||||
except Exception as e: # pylint: disable=broad-except
|
except Exception: # pylint: disable=broad-except
|
||||||
logger.exception(f"(PID {os.getpid()}) {self.engine.name}: engine INIT failed, exception: {e}")
|
logger.exception(
|
||||||
|
f"(PID {os.getpid()}) Init method of engine %s failed due to an exception.", self.engine.name
|
||||||
|
)
|
||||||
init_ok = False
|
init_ok = False
|
||||||
|
|
||||||
# In older engines, None is returned from the init method, which is
|
# In older engines, None is returned from the init method, which is
|
||||||
# equivalent to indicating that the initialization was successful
|
# equivalent to indicating that the initialization was successful.
|
||||||
# (compare: Engine.setup).
|
|
||||||
|
|
||||||
if init_ok is None:
|
if init_ok is None:
|
||||||
init_ok = True
|
init_ok = True
|
||||||
|
|
||||||
if not init_ok:
|
|
||||||
logger.error(f"(PID {os.getpid()}) {self.engine.name}: engine init was not successful")
|
|
||||||
|
|
||||||
return init_ok
|
return init_ok
|
||||||
|
|
||||||
def handle_exception(
|
def handle_exception(
|
||||||
|
|||||||
@@ -255,11 +255,11 @@ class OnlineProcessor(EngineProcessor):
|
|||||||
except ssl.SSLError as e:
|
except ssl.SSLError as e:
|
||||||
# requests timeout (connect or read)
|
# requests timeout (connect or read)
|
||||||
self.handle_exception(result_container, e, suspend=True)
|
self.handle_exception(result_container, e, suspend=True)
|
||||||
self.logger.debug("SSLError {}, verify={}".format(e, searx.network.get_network(self.engine.name).verify))
|
self.logger.error("SSLError {}, verify={}".format(e, searx.network.get_network(self.engine.name).verify))
|
||||||
except (httpx.TimeoutException, asyncio.TimeoutError) as e:
|
except (httpx.TimeoutException, asyncio.TimeoutError) as e:
|
||||||
# requests timeout (connect or read)
|
# requests timeout (connect or read)
|
||||||
self.handle_exception(result_container, e, suspend=True)
|
self.handle_exception(result_container, e, suspend=True)
|
||||||
self.logger.debug(
|
self.logger.error(
|
||||||
"HTTP requests timeout (search duration : {0} s, timeout: {1} s) : {2}".format(
|
"HTTP requests timeout (search duration : {0} s, timeout: {1} s) : {2}".format(
|
||||||
default_timer() - start_time, timeout_limit, e.__class__.__name__
|
default_timer() - start_time, timeout_limit, e.__class__.__name__
|
||||||
)
|
)
|
||||||
@@ -267,7 +267,7 @@ class OnlineProcessor(EngineProcessor):
|
|||||||
except (httpx.HTTPError, httpx.StreamError) as e:
|
except (httpx.HTTPError, httpx.StreamError) as e:
|
||||||
# other requests exception
|
# other requests exception
|
||||||
self.handle_exception(result_container, e, suspend=True)
|
self.handle_exception(result_container, e, suspend=True)
|
||||||
self.logger.debug(
|
self.logger.exception(
|
||||||
"requests exception (search duration : {0} s, timeout: {1} s) : {2}".format(
|
"requests exception (search duration : {0} s, timeout: {1} s) : {2}".format(
|
||||||
default_timer() - start_time, timeout_limit, e
|
default_timer() - start_time, timeout_limit, e
|
||||||
)
|
)
|
||||||
@@ -278,7 +278,7 @@ class OnlineProcessor(EngineProcessor):
|
|||||||
SearxEngineAccessDeniedException,
|
SearxEngineAccessDeniedException,
|
||||||
) as e:
|
) as e:
|
||||||
self.handle_exception(result_container, e, suspend=True)
|
self.handle_exception(result_container, e, suspend=True)
|
||||||
self.logger.debug(e.message)
|
self.logger.exception(e.message)
|
||||||
except Exception as e: # pylint: disable=broad-except
|
except Exception as e: # pylint: disable=broad-except
|
||||||
self.handle_exception(result_container, e)
|
self.handle_exception(result_container, e)
|
||||||
self.logger.debug("exception : {0}".format(e))
|
self.logger.exception("exception : {0}".format(e))
|
||||||
|
|||||||
@@ -41,13 +41,13 @@ search:
|
|||||||
# Filter results. 0: None, 1: Moderate, 2: Strict
|
# Filter results. 0: None, 1: Moderate, 2: Strict
|
||||||
safe_search: 0
|
safe_search: 0
|
||||||
# Existing autocomplete backends: "360search", "baidu", "bing", "brave", "dbpedia", "duckduckgo", "google",
|
# Existing autocomplete backends: "360search", "baidu", "bing", "brave", "dbpedia", "duckduckgo", "google",
|
||||||
# "kagi", "yandex", "privacywall", "mwmbl", "naver", "seznam", "sogou", "startpage", "swisscows", "quark",
|
# "yandex", "privacywall", "mwmbl", "naver", "seznam", "sogou", "startpage", "swisscows", "quark", "qwant",
|
||||||
# "qwant", "wikipedia" - leave blank to turn it off by default.
|
# "wikipedia" - leave blank to turn it off by default.
|
||||||
autocomplete: ""
|
autocomplete: ""
|
||||||
# minimun characters to type before autocompleter starts
|
# minimun characters to type before autocompleter starts
|
||||||
autocomplete_min: 4
|
autocomplete_min: 4
|
||||||
# backend for the favicon near URL in search results.
|
# backend for the favicon near URL in search results.
|
||||||
# Available resolvers: "allesedv", "duckduckgo", "google", "kagi", "yandex" - leave blank to turn it off by default.
|
# Available resolvers: "allesedv", "duckduckgo", "google", "yandex" - leave blank to turn it off by default.
|
||||||
favicon_resolver: ""
|
favicon_resolver: ""
|
||||||
# Default search language - leave blank to detect from browser information or
|
# Default search language - leave blank to detect from browser information or
|
||||||
# use codes from 'languages.py'
|
# use codes from 'languages.py'
|
||||||
@@ -477,24 +477,6 @@ engines:
|
|||||||
engine: arxiv
|
engine: arxiv
|
||||||
shortcut: arx
|
shortcut: arx
|
||||||
|
|
||||||
- name: avalw
|
|
||||||
engine: json_engine
|
|
||||||
shortcut: av
|
|
||||||
categories: general
|
|
||||||
paging: true
|
|
||||||
search_url: https://avalw.org/api/search?q={query}&page={pageno}&limit=10&tbm=all
|
|
||||||
results_query: results
|
|
||||||
url_query: url
|
|
||||||
title_query: title
|
|
||||||
content_query: snippet
|
|
||||||
thumbnail: image_url
|
|
||||||
disabled: true
|
|
||||||
inactive: true
|
|
||||||
about:
|
|
||||||
website: https://avalw.com
|
|
||||||
description: "Search engine from the Romanian news company AVALW S.R.L."
|
|
||||||
results: JSON
|
|
||||||
|
|
||||||
- name: ayo
|
- name: ayo
|
||||||
engine: xpath
|
engine: xpath
|
||||||
categories: general
|
categories: general
|
||||||
@@ -1217,12 +1199,10 @@ engines:
|
|||||||
- name: google
|
- name: google
|
||||||
engine: google
|
engine: google
|
||||||
shortcut: go
|
shortcut: go
|
||||||
inactive: true
|
|
||||||
|
|
||||||
- name: google images
|
- name: google images
|
||||||
engine: google_images
|
engine: google_images
|
||||||
shortcut: goi
|
shortcut: goi
|
||||||
inactive: true
|
|
||||||
|
|
||||||
- name: google news
|
- name: google news
|
||||||
engine: google_news
|
engine: google_news
|
||||||
@@ -1231,17 +1211,6 @@ engines:
|
|||||||
- name: google videos
|
- name: google videos
|
||||||
engine: google_videos
|
engine: google_videos
|
||||||
shortcut: gov
|
shortcut: gov
|
||||||
inactive: true
|
|
||||||
|
|
||||||
- name: google cse
|
|
||||||
engine: google_cse
|
|
||||||
shortcut: goc
|
|
||||||
|
|
||||||
- name: google cse images
|
|
||||||
engine: google_cse
|
|
||||||
categories: [images, web]
|
|
||||||
google_categ: image
|
|
||||||
shortcut: goci
|
|
||||||
|
|
||||||
- name: google scholar
|
- name: google scholar
|
||||||
engine: google_scholar
|
engine: google_scholar
|
||||||
@@ -1411,12 +1380,6 @@ engines:
|
|||||||
shortcut: iq
|
shortcut: iq
|
||||||
disabled: true
|
disabled: true
|
||||||
|
|
||||||
- name: jina
|
|
||||||
engine: jina
|
|
||||||
shortcut: ji
|
|
||||||
api_key: ""
|
|
||||||
inactive: true
|
|
||||||
|
|
||||||
# - name: kagi
|
# - name: kagi
|
||||||
# engine: kagi
|
# engine: kagi
|
||||||
# categories: [general, web]
|
# categories: [general, web]
|
||||||
@@ -1446,33 +1409,6 @@ engines:
|
|||||||
# api_key: "" # required
|
# api_key: "" # required
|
||||||
# kagi_categ: videos
|
# kagi_categ: videos
|
||||||
|
|
||||||
- name: kavunka demo
|
|
||||||
engine: xpath
|
|
||||||
categories: general
|
|
||||||
paging: true
|
|
||||||
shortcut: kav
|
|
||||||
search_url: https://kavunka.net/search/kavunka-srv.php
|
|
||||||
method: POST
|
|
||||||
request_body: request={query}&np={pageno}
|
|
||||||
headers:
|
|
||||||
Content-Type: application/x-www-form-urlencoded
|
|
||||||
disabled: true
|
|
||||||
inactive: true
|
|
||||||
results_xpath: //div[contains(@class, "issue")]
|
|
||||||
url_xpath: .//h2/a/@href
|
|
||||||
title_xpath: .//h2
|
|
||||||
content_xpath: .//div[contains(@class, "snip")]
|
|
||||||
about:
|
|
||||||
website: https://kavunka.net
|
|
||||||
description: "Demo index of Kavunka, a statistical search engine"
|
|
||||||
results: HTML
|
|
||||||
|
|
||||||
- name: keenable
|
|
||||||
engine: keenable
|
|
||||||
shortcut: keen
|
|
||||||
disabled: true
|
|
||||||
inactive: true
|
|
||||||
|
|
||||||
- name: kozmonavt
|
- name: kozmonavt
|
||||||
engine: xpath
|
engine: xpath
|
||||||
search_url: https://kozmonavt.su/s?q={query}
|
search_url: https://kozmonavt.su/s?q={query}
|
||||||
@@ -1649,11 +1585,6 @@ engines:
|
|||||||
disabled: true
|
disabled: true
|
||||||
inactive: true
|
inactive: true
|
||||||
|
|
||||||
- name: magnific
|
|
||||||
engine: magnific
|
|
||||||
shortcut: mag
|
|
||||||
disabled: true
|
|
||||||
|
|
||||||
- name: marginalia
|
- name: marginalia
|
||||||
engine: marginalia
|
engine: marginalia
|
||||||
shortcut: mar
|
shortcut: mar
|
||||||
@@ -1755,12 +1686,6 @@ engines:
|
|||||||
shortcut: mwm
|
shortcut: mwm
|
||||||
disabled: true
|
disabled: true
|
||||||
|
|
||||||
- name: neocities
|
|
||||||
engine: neocities
|
|
||||||
shortcut: nc
|
|
||||||
disabled: true
|
|
||||||
inactive: true
|
|
||||||
|
|
||||||
- name: niconico
|
- name: niconico
|
||||||
engine: niconico
|
engine: niconico
|
||||||
shortcut: nico
|
shortcut: nico
|
||||||
@@ -1932,11 +1857,6 @@ engines:
|
|||||||
engine: photon
|
engine: photon
|
||||||
shortcut: ph
|
shortcut: ph
|
||||||
|
|
||||||
- name: picjumbo
|
|
||||||
engine: picjumbo
|
|
||||||
shortcut: pj
|
|
||||||
disabled: true
|
|
||||||
|
|
||||||
- name: pinterest
|
- name: pinterest
|
||||||
engine: pinterest
|
engine: pinterest
|
||||||
shortcut: pin
|
shortcut: pin
|
||||||
@@ -2028,6 +1948,41 @@ engines:
|
|||||||
shortcut: poc
|
shortcut: poc
|
||||||
disabled: true
|
disabled: true
|
||||||
|
|
||||||
|
- name: presearch
|
||||||
|
engine: presearch
|
||||||
|
search_type: search
|
||||||
|
categories: [general, web]
|
||||||
|
shortcut: ps
|
||||||
|
timeout: 4.0
|
||||||
|
disabled: true
|
||||||
|
|
||||||
|
- name: presearch images
|
||||||
|
engine: presearch
|
||||||
|
network: presearch
|
||||||
|
search_type: images
|
||||||
|
categories: [images, web]
|
||||||
|
timeout: 4.0
|
||||||
|
shortcut: psimg
|
||||||
|
disabled: true
|
||||||
|
|
||||||
|
- name: presearch videos
|
||||||
|
engine: presearch
|
||||||
|
network: presearch
|
||||||
|
search_type: videos
|
||||||
|
categories: [general, web]
|
||||||
|
timeout: 4.0
|
||||||
|
shortcut: psvid
|
||||||
|
disabled: true
|
||||||
|
|
||||||
|
- name: presearch news
|
||||||
|
engine: presearch
|
||||||
|
network: presearch
|
||||||
|
search_type: news
|
||||||
|
categories: [news, web]
|
||||||
|
timeout: 4.0
|
||||||
|
shortcut: psnews
|
||||||
|
disabled: true
|
||||||
|
|
||||||
- name: pub.dev
|
- name: pub.dev
|
||||||
engine: xpath
|
engine: xpath
|
||||||
shortcut: pd
|
shortcut: pd
|
||||||
@@ -2153,6 +2108,12 @@ engines:
|
|||||||
require_api_key: false
|
require_api_key: false
|
||||||
results: JSON
|
results: JSON
|
||||||
|
|
||||||
|
- name: reddit
|
||||||
|
engine: reddit
|
||||||
|
shortcut: re
|
||||||
|
page_size: 25
|
||||||
|
disabled: true
|
||||||
|
|
||||||
- name: reuters
|
- name: reuters
|
||||||
engine: reuters
|
engine: reuters
|
||||||
shortcut: reu
|
shortcut: reu
|
||||||
@@ -2204,11 +2165,6 @@ engines:
|
|||||||
engine: sepiasearch
|
engine: sepiasearch
|
||||||
shortcut: sep
|
shortcut: sep
|
||||||
|
|
||||||
- name: shopify stock
|
|
||||||
engine: shopify_stock
|
|
||||||
shortcut: shs
|
|
||||||
disabled: true
|
|
||||||
|
|
||||||
- name: sogou
|
- name: sogou
|
||||||
engine: sogou
|
engine: sogou
|
||||||
shortcut: sogou
|
shortcut: sogou
|
||||||
@@ -2239,11 +2195,6 @@ engines:
|
|||||||
api_site: 'stackoverflow'
|
api_site: 'stackoverflow'
|
||||||
categories: [it, q&a]
|
categories: [it, q&a]
|
||||||
|
|
||||||
- name: stocksnap
|
|
||||||
engine: stocksnap
|
|
||||||
shortcut: sto
|
|
||||||
disabled: true
|
|
||||||
|
|
||||||
- name: askubuntu
|
- name: askubuntu
|
||||||
engine: stackexchange
|
engine: stackexchange
|
||||||
shortcut: ubuntu
|
shortcut: ubuntu
|
||||||
@@ -2883,12 +2834,6 @@ engines:
|
|||||||
shortcut: nvrv
|
shortcut: nvrv
|
||||||
disabled: true
|
disabled: true
|
||||||
|
|
||||||
- name: neosearch
|
|
||||||
engine: neosearch
|
|
||||||
shortcut: neo
|
|
||||||
disabled: true
|
|
||||||
inactive: true
|
|
||||||
|
|
||||||
- name: rubygems
|
- name: rubygems
|
||||||
shortcut: rbg
|
shortcut: rbg
|
||||||
engine: xpath
|
engine: xpath
|
||||||
@@ -3018,17 +2963,44 @@ engines:
|
|||||||
results: HTML
|
results: HTML
|
||||||
|
|
||||||
- name: searchzee
|
- name: searchzee
|
||||||
engine: searchzee
|
engine: json_engine
|
||||||
|
search_url: https://searchzee.com/api/search?q={query}&type=web&offset={pageno}
|
||||||
|
paging: true
|
||||||
|
first_page_num: 0
|
||||||
|
results_query: results
|
||||||
|
url_query: url
|
||||||
|
title_query: title
|
||||||
|
content_query: summary
|
||||||
|
content_html_to_text: true
|
||||||
categories: general
|
categories: general
|
||||||
searchzee_categ: web
|
|
||||||
shortcut: sz
|
shortcut: sz
|
||||||
disabled: true
|
disabled: true
|
||||||
inactive: true
|
inactive: true
|
||||||
|
about:
|
||||||
|
website: https://searchzee.com
|
||||||
|
use_official_api: false
|
||||||
|
require_api_key: false
|
||||||
|
results: JSON
|
||||||
|
|
||||||
- name: searchzee news
|
- name: searchzee news
|
||||||
engine: searchzee
|
engine: json_engine
|
||||||
|
search_url: https://searchzee.com/api/search?q={query}&type=news&offset={pageno}{time_range}
|
||||||
|
paging: true
|
||||||
|
first_page_num: 0
|
||||||
|
time_range_support: true
|
||||||
|
time_range_url: "&freshness={time_range_val}"
|
||||||
|
time_range_map:
|
||||||
|
day: pd
|
||||||
|
week: pw
|
||||||
|
month: pm
|
||||||
|
year: py
|
||||||
|
results_query: results
|
||||||
|
url_query: url
|
||||||
|
title_query: title
|
||||||
|
content_query: summary
|
||||||
|
thumbnail_query: thumbnail
|
||||||
|
content_html_to_text: true
|
||||||
categories: news
|
categories: news
|
||||||
searchzee_categ: news
|
|
||||||
shortcut: sznw
|
shortcut: sznw
|
||||||
disabled: true
|
disabled: true
|
||||||
inactive: true
|
inactive: true
|
||||||
@@ -3267,14 +3239,6 @@ engines:
|
|||||||
# brave_category: goggles
|
# brave_category: goggles
|
||||||
# Goggles: # required! This should be a URL ending in .goggle
|
# Goggles: # required! This should be a URL ending in .goggle
|
||||||
|
|
||||||
- name: exaapi
|
|
||||||
engine: exaapi
|
|
||||||
shortcut: exa
|
|
||||||
api_key: ""
|
|
||||||
search_type: auto
|
|
||||||
content_mode: highlights
|
|
||||||
inactive: true
|
|
||||||
|
|
||||||
- name: lib.rs
|
- name: lib.rs
|
||||||
shortcut: lrs
|
shortcut: lrs
|
||||||
engine: lib_rs
|
engine: lib_rs
|
||||||
@@ -3321,36 +3285,6 @@ engines:
|
|||||||
base_url: https://info.searchtoday.site
|
base_url: https://info.searchtoday.site
|
||||||
disabled: true
|
disabled: true
|
||||||
|
|
||||||
- name: sina
|
|
||||||
engine: json_engine
|
|
||||||
shortcut: sina
|
|
||||||
categories: news
|
|
||||||
paging: true
|
|
||||||
first_page_num: 1
|
|
||||||
search_url: https://search.sina.com.cn/api/search?q={query}&tp=mix&sort=0&page={pageno}&size=10&from=search_result
|
|
||||||
results_query: data/list
|
|
||||||
url_query: url
|
|
||||||
title_query: title
|
|
||||||
content_query: intro
|
|
||||||
thumbnail_query: thumb
|
|
||||||
title_html_to_text: true
|
|
||||||
time_range_map:
|
|
||||||
day: d
|
|
||||||
week: w
|
|
||||||
month: m
|
|
||||||
year: y
|
|
||||||
time_range_support: true
|
|
||||||
time_range_url: "&from=advanced_search&time={time_range_val}"
|
|
||||||
disabled: true
|
|
||||||
inactive: true
|
|
||||||
language: zh
|
|
||||||
about:
|
|
||||||
website: https://search.sina.com.cn
|
|
||||||
wikidata_id: Q938668
|
|
||||||
use_official_api: false
|
|
||||||
require_api_key: false
|
|
||||||
results: JSON
|
|
||||||
|
|
||||||
# - name: webcrawler
|
# - name: webcrawler
|
||||||
# engine: s1search
|
# engine: s1search
|
||||||
# shortcut: wc
|
# shortcut: wc
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"5Ako-qGW.min.js","names":[],"sources":["../../../../../client/simple/src/js/main/search.ts"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\n\nimport { listen } from \"../toolkit.ts\";\nimport { getElement } from \"../util/getElement.ts\";\n\nconst searchForm: HTMLFormElement = getElement<HTMLFormElement>(\"search\");\nconst searchInput: HTMLInputElement = getElement<HTMLInputElement>(\"q\");\nconst searchReset: HTMLButtonElement = getElement<HTMLButtonElement>(\"clear_search\");\n\nconst isMobile: boolean = window.matchMedia(\"(max-width: 50em)\").matches;\nconst isResultsPage: boolean = document.querySelector(\"main\")?.id === \"main_results\";\n\nconst categoryButtons: HTMLButtonElement[] = Array.from(\n document.querySelectorAll<HTMLButtonElement>(\"#categories_container button.category\")\n);\n\nif (searchInput.value.length === 0) {\n searchReset.classList.add(\"empty\");\n}\n\n// focus search input on large screens\nif (!(isMobile || isResultsPage)) {\n searchInput.focus();\n}\n\n// On mobile, move cursor to the end of the input on focus\nif (isMobile) {\n listen(\"focus\", searchInput, () => {\n // Defer cursor move until the next frame to prevent a visual jump\n requestAnimationFrame(() => {\n const end = searchInput.value.length;\n searchInput.setSelectionRange(end, end);\n searchInput.scrollLeft = searchInput.scrollWidth;\n });\n });\n}\n\nlisten(\"input\", searchInput, () => {\n searchReset.classList.toggle(\"empty\", searchInput.value.length === 0);\n});\n\nlisten(\"click\", searchReset, (event: MouseEvent) => {\n event.preventDefault();\n searchInput.value = \"\";\n searchInput.focus();\n searchReset.classList.add(\"empty\");\n});\n\nfor (const button of categoryButtons) {\n listen(\"click\", button, (event: MouseEvent) => {\n if (event.shiftKey) {\n event.preventDefault();\n button.classList.toggle(\"selected\");\n return;\n }\n\n // deselect all other categories\n for (const categoryButton of categoryButtons) {\n categoryButton.classList.toggle(\"selected\", categoryButton === button);\n }\n });\n}\n\nif (document.querySelector(\"div.search_filters\")) {\n const safesearchElement = document.getElementById(\"safesearch\");\n if (safesearchElement) {\n listen(\"change\", safesearchElement, () => searchForm.submit());\n }\n\n const timeRangeElement = document.getElementById(\"time_range\");\n if (timeRangeElement) {\n listen(\"change\", timeRangeElement, () => searchForm.submit());\n }\n\n const languageElement = document.getElementById(\"language\");\n if (languageElement) {\n listen(\"change\", languageElement, () => searchForm.submit());\n }\n}\n\n// override searchForm submit event\nlisten(\"submit\", searchForm, (event: Event) => {\n event.preventDefault();\n\n if (categoryButtons.length > 0) {\n const searchCategories = getElement<HTMLInputElement>(\"selected-categories\");\n searchCategories.value = categoryButtons\n .filter((button) => button.classList.contains(\"selected\"))\n .map((button) => button.name.replace(\"category_\", \"\"))\n .join(\",\");\n }\n\n searchForm.submit();\n});\n"],"mappings":"yEAKA,IAAM,EAA8B,EAA4B,QAAQ,EAClE,EAAgC,EAA6B,GAAG,EAChE,EAAiC,EAA8B,cAAc,EAE7E,EAAoB,OAAO,WAAW,mBAAmB,CAAC,CAAC,QAC3D,EAAyB,SAAS,cAAc,MAAM,CAAC,EAAE,KAAO,eAEhE,EAAuC,MAAM,KACjD,SAAS,iBAAoC,uCAAuC,CACtF,EAEI,EAAY,MAAM,SAAW,GAC/B,EAAY,UAAU,IAAI,OAAO,EAI7B,GAAY,GAChB,EAAY,MAAM,EAIhB,GACF,EAAO,QAAS,MAAmB,CAEjC,0BAA4B,CAC1B,IAAM,EAAM,EAAY,MAAM,OAC9B,EAAY,kBAAkB,EAAK,CAAG,EACtC,EAAY,WAAa,EAAY,WACvC,CAAC,CACH,CAAC,EAGH,EAAO,QAAS,MAAmB,CACjC,EAAY,UAAU,OAAO,QAAS,EAAY,MAAM,SAAW,CAAC,CACtE,CAAC,EAED,EAAO,QAAS,EAAc,GAAsB,CAClD,EAAM,eAAe,EACrB,EAAY,MAAQ,GACpB,EAAY,MAAM,EAClB,EAAY,UAAU,IAAI,OAAO,CACnC,CAAC,EAED,IAAK,IAAM,KAAU,EACnB,EAAO,QAAS,EAAS,GAAsB,CAC7C,GAAI,EAAM,SAAU,CAClB,EAAM,eAAe,EACrB,EAAO,UAAU,OAAO,UAAU,EAClC,MACF,CAGA,IAAK,IAAM,KAAkB,EAC3B,EAAe,UAAU,OAAO,WAAY,IAAmB,CAAM,CAEzE,CAAC,EAGH,GAAI,SAAS,cAAc,oBAAoB,EAAG,CAChD,IAAM,EAAoB,SAAS,eAAe,YAAY,EAC1D,GACF,EAAO,SAAU,MAAyB,EAAW,OAAO,CAAC,EAG/D,IAAM,EAAmB,SAAS,eAAe,YAAY,EACzD,GACF,EAAO,SAAU,MAAwB,EAAW,OAAO,CAAC,EAG9D,IAAM,EAAkB,SAAS,eAAe,UAAU,EACtD,GACF,EAAO,SAAU,MAAuB,EAAW,OAAO,CAAC,CAE/D,CAGA,EAAO,SAAU,EAAa,GAAiB,CAG7C,GAFA,EAAM,eAAe,EAEjB,EAAgB,OAAS,EAAG,CAC9B,IAAM,EAAmB,EAA6B,qBAAqB,EAC3E,EAAiB,MAAQ,EACtB,OAAQ,GAAW,EAAO,UAAU,SAAS,UAAU,CAAC,CAAC,CACzD,IAAK,GAAW,EAAO,KAAK,QAAQ,YAAa,EAAE,CAAC,CAAC,CACrD,KAAK,GAAG,CACb,CAEA,EAAW,OAAO,CACpB,CAAC"}
|
{"version":3,"file":"5Ako-qGW.min.js","names":[],"sources":["../../../../../client/simple/src/js/main/search.ts"],"sourcesContent":["// SPDX-License-Identifier: AGPL-3.0-or-later\n\nimport { listen } from \"../toolkit.ts\";\nimport { getElement } from \"../util/getElement.ts\";\n\nconst searchForm: HTMLFormElement = getElement<HTMLFormElement>(\"search\");\nconst searchInput: HTMLInputElement = getElement<HTMLInputElement>(\"q\");\nconst searchReset: HTMLButtonElement = getElement<HTMLButtonElement>(\"clear_search\");\n\nconst isMobile: boolean = window.matchMedia(\"(max-width: 50em)\").matches;\nconst isResultsPage: boolean = document.querySelector(\"main\")?.id === \"main_results\";\n\nconst categoryButtons: HTMLButtonElement[] = Array.from(\n document.querySelectorAll<HTMLButtonElement>(\"#categories_container button.category\")\n);\n\nif (searchInput.value.length === 0) {\n searchReset.classList.add(\"empty\");\n}\n\n// focus search input on large screens\nif (!(isMobile || isResultsPage)) {\n searchInput.focus();\n}\n\n// On mobile, move cursor to the end of the input on focus\nif (isMobile) {\n listen(\"focus\", searchInput, () => {\n // Defer cursor move until the next frame to prevent a visual jump\n requestAnimationFrame(() => {\n const end = searchInput.value.length;\n searchInput.setSelectionRange(end, end);\n searchInput.scrollLeft = searchInput.scrollWidth;\n });\n });\n}\n\nlisten(\"input\", searchInput, () => {\n searchReset.classList.toggle(\"empty\", searchInput.value.length === 0);\n});\n\nlisten(\"click\", searchReset, (event: MouseEvent) => {\n event.preventDefault();\n searchInput.value = \"\";\n searchInput.focus();\n searchReset.classList.add(\"empty\");\n});\n\nfor (const button of categoryButtons) {\n listen(\"click\", button, (event: MouseEvent) => {\n if (event.shiftKey) {\n event.preventDefault();\n button.classList.toggle(\"selected\");\n return;\n }\n\n // deselect all other categories\n for (const categoryButton of categoryButtons) {\n categoryButton.classList.toggle(\"selected\", categoryButton === button);\n }\n });\n}\n\nif (document.querySelector(\"div.search_filters\")) {\n const safesearchElement = document.getElementById(\"safesearch\");\n if (safesearchElement) {\n listen(\"change\", safesearchElement, () => searchForm.submit());\n }\n\n const timeRangeElement = document.getElementById(\"time_range\");\n if (timeRangeElement) {\n listen(\"change\", timeRangeElement, () => searchForm.submit());\n }\n\n const languageElement = document.getElementById(\"language\");\n if (languageElement) {\n listen(\"change\", languageElement, () => searchForm.submit());\n }\n}\n\n// override searchForm submit event\nlisten(\"submit\", searchForm, (event: Event) => {\n event.preventDefault();\n\n if (categoryButtons.length > 0) {\n const searchCategories = getElement<HTMLInputElement>(\"selected-categories\");\n searchCategories.value = categoryButtons\n .filter((button) => button.classList.contains(\"selected\"))\n .map((button) => button.name.replace(\"category_\", \"\"))\n .join(\",\");\n }\n\n searchForm.submit();\n});\n"],"mappings":"yEAKA,IAAM,EAA8B,EAA4B,QAAQ,EAClE,EAAgC,EAA6B,GAAG,EAChE,EAAiC,EAA8B,cAAc,EAE7E,EAAoB,OAAO,WAAW,mBAAmB,EAAE,QAC3D,EAAyB,SAAS,cAAc,MAAM,GAAG,KAAO,eAEhE,EAAuC,MAAM,KACjD,SAAS,iBAAoC,uCAAuC,CACtF,EAEI,EAAY,MAAM,SAAW,GAC/B,EAAY,UAAU,IAAI,OAAO,EAI7B,GAAY,GAChB,EAAY,MAAM,EAIhB,GACF,EAAO,QAAS,MAAmB,CAEjC,0BAA4B,CAC1B,IAAM,EAAM,EAAY,MAAM,OAC9B,EAAY,kBAAkB,EAAK,CAAG,EACtC,EAAY,WAAa,EAAY,WACvC,CAAC,CACH,CAAC,EAGH,EAAO,QAAS,MAAmB,CACjC,EAAY,UAAU,OAAO,QAAS,EAAY,MAAM,SAAW,CAAC,CACtE,CAAC,EAED,EAAO,QAAS,EAAc,GAAsB,CAClD,EAAM,eAAe,EACrB,EAAY,MAAQ,GACpB,EAAY,MAAM,EAClB,EAAY,UAAU,IAAI,OAAO,CACnC,CAAC,EAED,IAAK,IAAM,KAAU,EACnB,EAAO,QAAS,EAAS,GAAsB,CAC7C,GAAI,EAAM,SAAU,CAClB,EAAM,eAAe,EACrB,EAAO,UAAU,OAAO,UAAU,EAClC,MACF,CAGA,IAAK,IAAM,KAAkB,EAC3B,EAAe,UAAU,OAAO,WAAY,IAAmB,CAAM,CAEzE,CAAC,EAGH,GAAI,SAAS,cAAc,oBAAoB,EAAG,CAChD,IAAM,EAAoB,SAAS,eAAe,YAAY,EAC1D,GACF,EAAO,SAAU,MAAyB,EAAW,OAAO,CAAC,EAG/D,IAAM,EAAmB,SAAS,eAAe,YAAY,EACzD,GACF,EAAO,SAAU,MAAwB,EAAW,OAAO,CAAC,EAG9D,IAAM,EAAkB,SAAS,eAAe,UAAU,EACtD,GACF,EAAO,SAAU,MAAuB,EAAW,OAAO,CAAC,CAE/D,CAGA,EAAO,SAAU,EAAa,GAAiB,CAG7C,GAFA,EAAM,eAAe,EAEjB,EAAgB,OAAS,EAAG,CAC9B,IAAM,EAAmB,EAA6B,qBAAqB,EAC3E,EAAiB,MAAQ,EACtB,OAAQ,GAAW,EAAO,UAAU,SAAS,UAAU,CAAC,EACxD,IAAK,GAAW,EAAO,KAAK,QAAQ,YAAa,EAAE,CAAC,EACpD,KAAK,GAAG,CACb,CAEA,EAAW,OAAO,CACpB,CAAC"}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user