summaryrefslogtreecommitdiff
path: root/searx/engines
diff options
context:
space:
mode:
authorBnyro <bnyro@tutanota.com>2023-10-07 10:26:04 +0200
committerMarkus Heiser <markus.heiser@darmarIT.de>2023-10-09 06:53:43 +0200
commit48cb58bd2ec4eb9cb4ba416f7ece75c3c6c41e55 (patch)
tree76f9f4e619a3391bc571e9f23ae3f6308c8df54c /searx/engines
parentc3ab49cd903d27905d2da6f70699a55c9a74593e (diff)
[feat] duckduckgo: support for videos and news
Diffstat (limited to 'searx/engines')
-rw-r--r--searx/engines/duckduckgo.py6
-rw-r--r--searx/engines/duckduckgo_extra.py (renamed from searx/engines/duckduckgo_images.py)71
2 files changed, 59 insertions, 18 deletions
diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py
index ebb4745b9..d0e818faf 100644
--- a/searx/engines/duckduckgo.py
+++ b/searx/engines/duckduckgo.py
@@ -66,8 +66,10 @@ def cache_vqd(query, value):
The vqd value depends on the query string and is needed for the follow up
pages or the images loaded by a XMLHttpRequest:
- - DuckDuckGo Web: `https://links.duckduckgo.com/d.js?q=...&vqd=...`
- - DuckDuckGo Images: `https://duckduckgo.com/i.js??q=...&vqd=...`
+ - DuckDuckGo Web: ``https://links.duckduckgo.com/d.js?q=...&vqd=...``
+ - DuckDuckGo Images: ``https://duckduckgo.com/i.js??q=...&vqd=...``
+ - DuckDuckGo Videos: ``https://duckduckgo.com/v.js??q=...&vqd=...``
+ - DuckDuckGo News: ``https://duckduckgo.com/news.js??q=...&vqd=...``
"""
c = redisdb.client()
diff --git a/searx/engines/duckduckgo_images.py b/searx/engines/duckduckgo_extra.py
index 7e7f133b1..7e3a3282d 100644
--- a/searx/engines/duckduckgo_images.py
+++ b/searx/engines/duckduckgo_extra.py
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
"""
-DuckDuckGo Images
-~~~~~~~~~~~~~~~~~
+DuckDuckGo Extra (images, videos, news)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
"""
+from datetime import datetime
from typing import TYPE_CHECKING
from urllib.parse import urlencode
@@ -32,6 +33,9 @@ about = {
# engine dependent config
categories = ['images', 'web']
+ddg_category = 'images'
+"""The category must be any of ``images``, ``videos`` and ``news``
+"""
paging = True
safesearch = True
send_accept_language_header = True
@@ -39,6 +43,8 @@ send_accept_language_header = True
safesearch_cookies = {0: '-2', 1: None, 2: '1'}
safesearch_args = {0: '1', 1: None, 2: '1'}
+search_path_map = {'images': 'i', 'videos': 'v', 'news': 'news'}
+
def request(query, params):
@@ -69,28 +75,61 @@ def request(query, params):
args['p'] = safe_search # "-1", "1"
logger.debug("cookies: %s", params['cookies'])
- args = urlencode(args)
- params['url'] = 'https://duckduckgo.com/i.js?{args}'.format(args=args)
+
+ params['url'] = f'https://duckduckgo.com/{search_path_map[ddg_category]}.js?{urlencode(args)}'
return params
+def _image_result(result):
+ return {
+ 'template': 'images.html',
+ 'url': result['url'],
+ 'title': result['title'],
+ 'content': '',
+ 'thumbnail_src': result['thumbnail'],
+ 'img_src': result['image'],
+ 'img_format': '%s x %s' % (result['width'], result['height']),
+ 'source': result['source'],
+ }
+
+
+def _video_result(result):
+ return {
+ 'template': 'videos.html',
+ 'url': result['content'],
+ 'title': result['title'],
+ 'content': result['description'],
+ 'thumbnail': result['images'].get('small') or result['images'].get('medium'),
+ 'iframe_src': result['embed_url'],
+ 'source': result['provider'],
+ 'length': result['duration'],
+ 'metadata': result.get('uploader'),
+ }
+
+
+def _news_result(result):
+ return {
+ 'url': result['url'],
+ 'title': result['title'],
+ 'content': result['excerpt'],
+ 'source': result['source'],
+ 'publishedDate': datetime.utcfromtimestamp(result['date']),
+ }
+
+
def response(resp):
results = []
res_json = resp.json()
for result in res_json['results']:
- results.append(
- {
- 'template': 'images.html',
- 'title': result['title'],
- 'content': '',
- 'thumbnail_src': result['thumbnail'],
- 'img_src': result['image'],
- 'url': result['url'],
- 'img_format': '%s x %s' % (result['width'], result['height']),
- 'source': result['source'],
- }
- )
+ if ddg_category == 'images':
+ results.append(_image_result(result))
+ elif ddg_category == 'videos':
+ results.append(_video_result(result))
+ elif ddg_category == 'news':
+ results.append(_news_result(result))
+ else:
+ raise ValueError(f"Invalid duckduckgo category: {ddg_category}")
return results