codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: run_module支持raise_exception

Browse Source
This commit is contained in:
InfinityPacer 2024-06-30 11:41:00 +08:00
parent 2944c343a8
commit 6267b3f670
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/chain/__init__.py
View File

@ -10,8 +10,7 @@ from ruamel.yaml import CommentedMap
from transmission_rpc import File from transmission_rpc import File
from app.core.config import settings from app.core.config import settings
from app.core.context import Context from app.core.context import Context, MediaInfo, TorrentInfo
from app.core.context import MediaInfo, TorrentInfo
from app.core.event import EventManager from app.core.event import EventManager
from app.core.meta import MetaBase from app.core.meta import MetaBase
from app.core.module import ModuleManager from app.core.module import ModuleManager
@ -79,6 +78,7 @@ class ChainBase(metaclass=ABCMeta):
def run_module(self, method: str, *args, **kwargs) -> Any: def run_module(self, method: str, *args, **kwargs) -> Any:
""" """
运行包含该方法的所有模块，然后返回结果 运行包含该方法的所有模块，然后返回结果
当kwargs包含命名参数raise_exception时，如模块方法抛出异常且raise_exception为True，则同步抛出异常
""" """
def is_result_empty(ret): def is_result_empty(ret):
@ -117,6 +117,8 @@ class ChainBase(metaclass=ABCMeta):
# 中止继续执行 # 中止继续执行
break break
except Exception as err: except Exception as err:
if kwargs.get("raise_exception"):
raise
logger.error( logger.error(
f"运行模块 {module_id}.{method} 出错：{str(err)}\n{traceback.format_exc()}") f"运行模块 {module_id}.{method} 出错：{str(err)}\n{traceback.format_exc()}")
self.messagehelper.put(title=f"{module_name}发生了错误", self.messagehelper.put(title=f"{module_name}发生了错误",
@ -166,7 +168,8 @@ class ChainBase(metaclass=ABCMeta):
tmdbid=tmdbid, doubanid=doubanid, bangumiid=bangumiid, cache=cache) tmdbid=tmdbid, doubanid=doubanid, bangumiid=bangumiid, cache=cache)
def match_doubaninfo(self, name: str, imdbid: str = None, def match_doubaninfo(self, name: str, imdbid: str = None,
mtype: MediaType = None, year: str = None, season: int = None) -> Optional[dict]: mtype: MediaType = None, year: str = None, season: int = None,
raise_exception: bool = False) -> Optional[dict]:
""" """
搜索和匹配豆瓣信息 搜索和匹配豆瓣信息
:param name: 标题 :param name: 标题
@ -174,9 +177,10 @@ class ChainBase(metaclass=ABCMeta):
:param mtype: 类型 :param mtype: 类型
:param year: 年份 :param year: 年份
:param season: 季 :param season: 季
:param raise_exception: 触发速率限制时是否抛出异常
""" """
return self.run_module("match_doubaninfo", name=name, imdbid=imdbid, return self.run_module("match_doubaninfo", name=name, imdbid=imdbid,
mtype=mtype, year=year, season=season) mtype=mtype, year=year, season=season, raise_exception=raise_exception)
def match_tmdbinfo(self, name: str, mtype: MediaType = None, def match_tmdbinfo(self, name: str, mtype: MediaType = None,
year: str = None, season: int = None) -> Optional[dict]: year: str = None, season: int = None) -> Optional[dict]:
@ -214,14 +218,15 @@ class ChainBase(metaclass=ABCMeta):
image_prefix=image_prefix, image_type=image_type, image_prefix=image_prefix, image_type=image_type,
season=season, episode=episode) season=season, episode=episode)
def douban_info(self, doubanid: str, mtype: MediaType = None) -> Optional[dict]: def douban_info(self, doubanid: str, mtype: MediaType = None, raise_exception: bool = False) -> Optional[dict]:
""" """
获取豆瓣信息 获取豆瓣信息
:param doubanid: 豆瓣ID :param doubanid: 豆瓣ID
:param mtype: 媒体类型 :param mtype: 媒体类型
:return: 豆瓣信息 :return: 豆瓣信息
:param raise_exception: 触发速率限制时是否抛出异常
""" """
return self.run_module("douban_info", doubanid=doubanid, mtype=mtype) return self.run_module("douban_info", doubanid=doubanid, mtype=mtype, raise_exception=raise_exception)
def tvdb_info(self, tvdbid: int) -> Optional[dict]: def tvdb_info(self, tvdbid: int) -> Optional[dict]:
""" """