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

fix: 同时更新电影订阅信息；修复 typo

Browse Source
This commit is contained in:
WithdewHua 2023-09-14 22:51:39 +08:00
parent 4ab60423c1
commit b8663ee735
No known key found for this signature in database
GPG Key ID: 552FBE15C7E2C264
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/chain/subscribe.py
View File

@ -277,7 +277,7 @@ class SubscribeChain(ChainBase):
logger.warn(f'订阅 {subscribe.keyword or subscribe.name} 未搜索到资源') logger.warn(f'订阅 {subscribe.keyword or subscribe.name} 未搜索到资源')
if meta.type == MediaType.TV: if meta.type == MediaType.TV:
# 未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数 # 未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数
self.__upate_lack_episodes(lefts=no_exists, subscribe=subscribe, mediainfo=mediainfo) self.__update_lack_episodes(lefts=no_exists, subscribe=subscribe, mediainfo=mediainfo)
continue continue
# 过滤 # 过滤
matched_contexts = [] matched_contexts = []
@ -318,7 +318,7 @@ class SubscribeChain(ChainBase):
logger.warn(f'订阅 {subscribe.name} 没有符合过滤条件的资源') logger.warn(f'订阅 {subscribe.name} 没有符合过滤条件的资源')
# 非洗版未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数 # 非洗版未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数
if meta.type == MediaType.TV and not subscribe.best_version: if meta.type == MediaType.TV and not subscribe.best_version:
self.__upate_lack_episodes(lefts=no_exists, subscribe=subscribe, mediainfo=mediainfo) self.__update_lack_episodes(lefts=no_exists, subscribe=subscribe, mediainfo=mediainfo)
continue continue
# 自动下载 # 自动下载
downloads, lefts = self.downloadchain.batch_download(contexts=matched_contexts, downloads, lefts = self.downloadchain.batch_download(contexts=matched_contexts,
@ -335,18 +335,18 @@ class SubscribeChain(ChainBase):
mediainfo=mediainfo, downloads=downloads) mediainfo=mediainfo, downloads=downloads)
else: else:
# 未完成下载 # 未完成下载
logger.info(f'{mediainfo.title_year} 未下载未完整，继续订阅 ...') logger.info(f'{mediainfo.title_year} 未下载完整，继续订阅 ...')
if meta.type == MediaType.TV and not subscribe.best_version: if meta.type == MediaType.TV and not subscribe.best_version:
# 更新订阅剩余集数和时间 # 更新订阅剩余集数和时间
update_date = True if downloads else False update_date = True if downloads else False
self.__upate_lack_episodes(lefts=lefts, subscribe=subscribe, self.__update_lack_episodes(lefts=lefts, subscribe=subscribe,
mediainfo=mediainfo, update_date=update_date) mediainfo=mediainfo, update_date=update_date)
# 手动触发时发送系统消息 # 手动触发时发送系统消息
if manual: if manual:
if sid: if sid:
self.message.put(f'订阅 {subscribes[0].name} 搜索完成！') self.message.put(f'订阅 {subscribes[0].name} 搜索完成！')
else: else:
self.message.put(f'所有订阅搜索完成！') self.message.put('所有订阅搜索完成！')
def finish_subscribe_or_not(self, subscribe: Subscribe, meta: MetaInfo, def finish_subscribe_or_not(self, subscribe: Subscribe, meta: MetaInfo,
mediainfo: MediaInfo, downloads: List[Context]): mediainfo: MediaInfo, downloads: List[Context]):
@ -509,11 +509,13 @@ class SubscribeChain(ChainBase):
torrent_list=[torrent_info]) torrent_list=[torrent_info])
if result is not None and not result: if result is not None and not result:
# 不符合过滤规则 # 不符合过滤规则
logger.info(f"{torrent_info.title} 不匹配当前过滤规则")
continue continue
# 不在订阅站点范围的不处理 # 不在订阅站点范围的不处理
if subscribe.sites: if subscribe.sites:
sub_sites = json.loads(subscribe.sites) sub_sites = json.loads(subscribe.sites)
if sub_sites and torrent_info.site not in sub_sites: if sub_sites and torrent_info.site not in sub_sites:
logger.info(f"{torrent_info.title} 不符合 {torrent_mediainfo.title_year} 订阅站点要求")
continue continue
# 如果是电视剧 # 如果是电视剧
if torrent_mediainfo.type == MediaType.TV: if torrent_mediainfo.type == MediaType.TV:
@ -585,12 +587,12 @@ class SubscribeChain(ChainBase):
if meta.type == MediaType.TV and not subscribe.best_version: if meta.type == MediaType.TV and not subscribe.best_version:
update_date = True if downloads else False update_date = True if downloads else False
# 未完成下载，计算剩余集数 # 未完成下载，计算剩余集数
self.__upate_lack_episodes(lefts=lefts, subscribe=subscribe, self.__update_lack_episodes(lefts=lefts, subscribe=subscribe,
mediainfo=mediainfo, update_date=update_date) mediainfo=mediainfo, update_date=update_date)
else: else:
if meta.type == MediaType.TV: if meta.type == MediaType.TV:
# 未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数 # 未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数
self.__upate_lack_episodes(lefts=no_exists, subscribe=subscribe, mediainfo=mediainfo) self.__update_lack_episodes(lefts=no_exists, subscribe=subscribe, mediainfo=mediainfo)
def check(self): def check(self):
""" """
@ -614,18 +616,15 @@ class SubscribeChain(ChainBase):
if not mediainfo: if not mediainfo:
logger.warn(f'未识别到媒体信息，标题：{subscribe.name}，tmdbid：{subscribe.tmdbid}') logger.warn(f'未识别到媒体信息，标题：{subscribe.name}，tmdbid：{subscribe.tmdbid}')
continue continue
if not mediainfo.seasons: # 对于电视剧，获取当前季的总集数
continue
# 获取当前季的总集数
episodes = mediainfo.seasons.get(subscribe.season) or [] episodes = mediainfo.seasons.get(subscribe.season) or []
if len(episodes) > subscribe.total_episode or 0: if len(episodes) > (subscribe.total_episode or 0):
total_episode = len(episodes) total_episode = len(episodes)
lack_episode = subscribe.lack_episode + (total_episode - subscribe.total_episode) lack_episode = subscribe.lack_episode + (total_episode - subscribe.total_episode)
logger.info(f'订阅 {subscribe.name} 总集数变化，更新总集数为{total_episode}，缺失集数为{lack_episode} ...') logger.info(f'订阅 {subscribe.name} 总集数变化，更新总集数为{total_episode}，缺失集数为{lack_episode} ...')
else: else:
total_episode = subscribe.total_episode total_episode = subscribe.total_episode
lack_episode = subscribe.lack_episode lack_episode = subscribe.lack_episode
logger.info(f'订阅 {subscribe.name} 总集数未变化')
# 更新TMDB信息 # 更新TMDB信息
self.subscribeoper.update(subscribe.id, { self.subscribeoper.update(subscribe.id, {
"name": mediainfo.title, "name": mediainfo.title,
@ -682,7 +681,7 @@ class SubscribeChain(ChainBase):
return True return True
return False return False
def __upate_lack_episodes(self, lefts: Dict[int, Dict[int, NotExistMediaInfo]], def __update_lack_episodes(self, lefts: Dict[int, Dict[int, NotExistMediaInfo]],
subscribe: Subscribe, subscribe: Subscribe,
mediainfo: MediaInfo, mediainfo: MediaInfo,
update_date: bool = False): update_date: bool = False):
@ -770,7 +769,7 @@ class SubscribeChain(ChainBase):
total_episode: int, total_episode: int,
start_episode: int): start_episode: int):
""" """
根据订阅开始集数和总结数，结合TMDB信息计算当前订阅的缺失集数 根据订阅开始集数和总集数，结合TMDB信息计算当前订阅的缺失集数
:param no_exists: 缺失季集列表 :param no_exists: 缺失季集列表
:param tmdb_id: TMDB ID :param tmdb_id: TMDB ID
:param begin_season: 开始季 :param begin_season: 开始季