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

fix

Browse Source
This commit is contained in:
jxxghp
2023-06-13 14:35:02 +08:00
parent 2b9975b9b2
commit 8776e51b22
11 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/chain/download.py
View File

@@ -199,7 +199,7 @@ class DownloadChain(ChainBase):
media = context.media_info
meta = context.meta_info
torrent = context.torrent_info
if media.type == MediaType.MOVIE:
if media.type != MediaType.TV:
continue
item_season = meta.get_season_list()
if meta.get_episode_list():
@@ -246,7 +246,7 @@ class DownloadChain(ChainBase):
for context in contexts:
media = context.media_info
meta = context.meta_info
if media.type == MediaType.MOVIE:
if media.type != MediaType.TV:
continue
if media.tmdb_id == need_tmdbid:
if context in downloaded_list:
@@ -286,7 +286,7 @@ class DownloadChain(ChainBase):
media = context.media_info
meta = context.meta_info
torrent = context.torrent_info
if media.type == MediaType.MOVIE:
if media.type != MediaType.TV:
continue
if context in downloaded_list:
continue

10
app/chain/subscribe.py
View File

@@ -59,6 +59,8 @@ class SubscribeChain(ChainBase):
self.obtain_image(mediainfo=mediainfo)
# 总集数
if mediainfo.type == MediaType.TV:
if not season:
season = 1
if not kwargs.get('total_episode'):
if not mediainfo.seasons:
# 补充媒体信息
@@ -71,7 +73,7 @@ class SubscribeChain(ChainBase):
if not mediainfo.seasons:
logger.error(f"媒体信息中没有季集信息，标题：{title}，tmdbid：{tmdbid}")
return False
total_episode = len(mediainfo.seasons.get(kwargs.get('season') or 1) or [])
total_episode = len(mediainfo.seasons.get(season) or [])
if not total_episode:
logger.error(f'未获取到总集数，标题：{title}，tmdbid：{tmdbid}')
return False
@@ -81,7 +83,7 @@ class SubscribeChain(ChainBase):
# 添加订阅
state, err_msg = self.subscribes.add(mediainfo, season=season, **kwargs)
if not state:
logger.info(f'{mediainfo.get_title_string()} {err_msg}')
logger.error(f'{mediainfo.get_title_string()} {err_msg}')
# 发回原用户
self.post_message(title=f"{mediainfo.get_title_string()}{metainfo.get_season_string()} "
f"添加订阅失败！",
@@ -89,7 +91,7 @@ class SubscribeChain(ChainBase):
image=mediainfo.get_message_image(),
userid=userid)
else:
logger.error(f'{mediainfo.get_title_string()}{metainfo.get_season_string()} 添加订阅成功')
logger.info(f'{mediainfo.get_title_string()}{metainfo.get_season_string()} 添加订阅成功')
# 广而告之
self.post_message(title=f"{mediainfo.get_title_string()}{metainfo.get_season_string()} 已添加订阅",
text=f"评分：{mediainfo.vote_average}，来自用户：{username or userid}",
@@ -279,7 +281,7 @@ class SubscribeChain(ChainBase):
season = season_info.get('season')
if season == subscribe.season:
left_episodes = season_info.get('episodes')
logger.info(f'{mediainfo.get_title_string()} 季 {season} 未下载未完整，'
logger.info(f'{mediainfo.get_title_string()} 季 {season} 未下载完整，'
f'更新缺失集数为{len(left_episodes)} ...')
self.subscribes.update(subscribe.id, {
"lack_episode": len(left_episodes)

2
app/chain/user_message.py
View File

@@ -290,8 +290,6 @@ class UserMessageChain(ChainBase):
# 合并信息
if mtype:
meta.type = mtype
elif meta.type != MediaType.TV:
meta.type = None
if season_num:
meta.begin_season = season_num
if episode_num: