Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions ddgs/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,18 @@ def search(
**kwargs: str,
) -> list[T] | None:
"""Search the engine."""
payload = self.build_payload(
query=query, region=region, safesearch=safesearch, timelimit=timelimit, page=page, **kwargs
)
if self.search_method == "GET":
html_text = self.request(self.search_method, self.search_url, params=payload)
else:
html_text = self.request(self.search_method, self.search_url, data=payload)
if not html_text:
return None
results = self.extract_results(html_text)
max_results = int(kwargs.get("max_results", 10))
results = list()
while len(results) <= max_results:
payload = self.build_payload(
query=query, region=region, safesearch=safesearch, timelimit=timelimit, page=page, **kwargs
)
if self.search_method == "GET":
html_text = self.request(self.search_method, self.search_url, params=payload)
else:
html_text = self.request(self.search_method, self.search_url, data=payload)
if not html_text:
return None
page += 1
results += self.extract_results(html_text)
return self.post_extract_results(results)
4 changes: 2 additions & 2 deletions ddgs/ddgs.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,7 @@ def _search_sync( # noqa: C901
region: str = "us-en",
safesearch: str = "moderate",
timelimit: str | None = None,
max_results: int | None = 10,
page: int = 1,
backend: str = "auto",
**kwargs: str,
) -> list[dict[str, Any]]:
"""Perform a search across engines in the given category.
Expand All @@ -169,12 +167,14 @@ def _search_sync( # noqa: C901
msg = "query is mandatory."
raise DDGSException(msg)

backend = kwargs.get("backend", "auto")
engines = self._get_engines(category, backend)
len_unique_providers = len({engine.provider for engine in engines})
seen_providers: set[str] = set()

# Perform search
results_aggregator: ResultsAggregator[set[str]] = ResultsAggregator({"href", "image", "url", "embed_url"})
max_results = int(kwargs.get("max_results", 0))
max_workers = min(len_unique_providers, ceil(max_results / 10) + 1) if max_results else len_unique_providers
if DDGS.threads:
max_workers = min(max_workers, DDGS.threads)
Expand Down