Merge remote-tracking branch 'origin/main'

This commit is contained in:
jxxghp 2023-06-11 22:02:55 +08:00
commit e2542627d2

View File

@ -92,7 +92,7 @@ class SubscribeChain(ChainBase):
logger.error(f'{mediainfo.get_title_string()}{metainfo.get_season_string()} 添加订阅成功') logger.error(f'{mediainfo.get_title_string()}{metainfo.get_season_string()} 添加订阅成功')
# 广而告之 # 广而告之
self.post_message(title=f"{mediainfo.get_title_string()}{metainfo.get_season_string()} 已添加订阅", self.post_message(title=f"{mediainfo.get_title_string()}{metainfo.get_season_string()} 已添加订阅",
text=f"来自用户:{username or userid}", text=f"评分:{mediainfo.vote_average}来自用户:{username or userid}",
image=mediainfo.get_message_image()) image=mediainfo.get_message_image())
# 返回结果 # 返回结果
return state return state
@ -117,7 +117,7 @@ class SubscribeChain(ChainBase):
# 生成元数据 # 生成元数据
meta = MetaInfo(subscribe.name) meta = MetaInfo(subscribe.name)
meta.year = subscribe.year meta.year = subscribe.year
meta.begin_season = subscribe.season meta.begin_season = subscribe.season or None
meta.type = MediaType.MOVIE if subscribe.type == MediaType.MOVIE.value else MediaType.TV meta.type = MediaType.MOVIE if subscribe.type == MediaType.MOVIE.value else MediaType.TV
# 识别媒体信息 # 识别媒体信息
mediainfo: MediaInfo = self.recognize_media(meta=meta, mtype=meta.type, tmdbid=subscribe.tmdbid) mediainfo: MediaInfo = self.recognize_media(meta=meta, mtype=meta.type, tmdbid=subscribe.tmdbid)
@ -213,7 +213,7 @@ class SubscribeChain(ChainBase):
# 生成元数据 # 生成元数据
meta = MetaInfo(subscribe.name) meta = MetaInfo(subscribe.name)
meta.year = subscribe.year meta.year = subscribe.year
meta.begin_season = subscribe.season meta.begin_season = subscribe.season or None
meta.type = MediaType.MOVIE if subscribe.type == MediaType.MOVIE.value else MediaType.TV meta.type = MediaType.MOVIE if subscribe.type == MediaType.MOVIE.value else MediaType.TV
# 识别媒体信息 # 识别媒体信息
mediainfo: MediaInfo = self.recognize_media(meta=meta, mtype=meta.type, tmdbid=subscribe.tmdbid) mediainfo: MediaInfo = self.recognize_media(meta=meta, mtype=meta.type, tmdbid=subscribe.tmdbid)