From f5c11f01cc3a1ddaa06393ae64825263dbcf046c Mon Sep 17 00:00:00 2001 From: adogecheems Date: Sun, 29 Sep 2024 22:29:08 +0800 Subject: [PATCH] new version --- anisearch/AniSearch.py | 18 ++++++++++++------ setup.py | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/anisearch/AniSearch.py b/anisearch/AniSearch.py index 2b6c223..98f6788 100644 --- a/anisearch/AniSearch.py +++ b/anisearch/AniSearch.py @@ -58,7 +58,7 @@ def reset(self) -> None: self.if_selected: Optional[bool] = False def search(self, keyword: str, collected: Optional[bool] = None, proxies: Optional[dict] = None, - system_proxy: Optional[bool] = None, **extra_options) -> None: + system_proxy: Optional[bool] = None, **extra_options) -> bool: """ Search for anime using the given keyword. @@ -67,26 +67,32 @@ def search(self, keyword: str, collected: Optional[bool] = None, proxies: Option - collected: Whether to collect results - proxies: Proxy settings - system_proxy: Whether to use system proxy + + Returns: + - True if search is successful, False otherwise. """ self.reset() + + # 使用过滤条件减少不必要的计算 kwargs = {'keyword': keyword} if collected is not None: kwargs['collected'] = collected - if proxies is not None: + if proxies: kwargs['proxies'] = proxies - if system_proxy is not None: + if system_proxy: kwargs['system_proxy'] = system_proxy - if extra_options is not None: - kwargs = {**kwargs, **extra_options} + kwargs.update(extra_options) try: self.animes = self.plugin.search(**kwargs) log.info(f"This search is complete: {keyword}") + return True except Exception as e: log.error(f"Search failed: {str(e)}") - raise + return False + def select(self, index: int) -> None: """ diff --git a/setup.py b/setup.py index 6080755..abf9c85 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='Anisearch-lib', - version='1.3.4', + version='1.3.5', packages=find_packages(exclude=['tests*']), install_requires=requirements, entry_points={