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

fix #1139 洗版重复下载问题

Browse Source
This commit is contained in:
jxxghp 2023-12-10 17:27:34 +08:00
parent 403054751b
commit b72ef4f2aa
1 changed files with 105 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
app/chain/subscribe.py
View File

@ -199,7 +199,8 @@ class SubscribeChain(ChainBase):
tmdbid=subscribe.tmdbid, tmdbid=subscribe.tmdbid,
doubanid=subscribe.doubanid) doubanid=subscribe.doubanid)
if not mediainfo: if not mediainfo:
logger.warn(f'未识别到媒体信息，标题：{subscribe.name}，tmdbid：{subscribe.tmdbid}，doubanid：{subscribe.doubanid}') logger.warn(
f'未识别到媒体信息，标题：{subscribe.name}，tmdbid：{subscribe.tmdbid}，doubanid：{subscribe.doubanid}')
continue continue
# 非洗版状态 # 非洗版状态
@ -240,7 +241,7 @@ class SubscribeChain(ChainBase):
# 电视剧订阅处理缺失集 # 电视剧订阅处理缺失集
if meta.type == MediaType.TV: if meta.type == MediaType.TV:
# 使用订阅的总集数和开始集数替换no_exists # 实际缺失集与订阅开始结束集范围进行整合
no_exists = self.__get_subscribe_no_exits( no_exists = self.__get_subscribe_no_exits(
no_exists=no_exists, no_exists=no_exists,
mediakey=mediakey, mediakey=mediakey,
@ -249,7 +250,7 @@ class SubscribeChain(ChainBase):
start_episode=subscribe.start_episode, start_episode=subscribe.start_episode,
) )
# 打印缺失集信息 # 打印汇总缺失集信息
if no_exists and no_exists.get(mediakey): if no_exists and no_exists.get(mediakey):
no_exists_info = no_exists.get(mediakey).get(subscribe.season) no_exists_info = no_exists.get(mediakey).get(subscribe.season)
if no_exists_info: if no_exists_info:
@ -279,13 +280,11 @@ class SubscribeChain(ChainBase):
filter_rule=filter_rule) filter_rule=filter_rule)
if not contexts: if not contexts:
logger.warn(f'订阅 {subscribe.keyword or subscribe.name} 未搜索到资源') logger.warn(f'订阅 {subscribe.keyword or subscribe.name} 未搜索到资源')
if meta.type == MediaType.TV: self.finish_subscribe_or_not(subscribe=subscribe, meta=meta,
# 未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数 mediainfo=mediainfo, lefts=no_exists)
self.__update_lack_episodes(lefts=no_exists, subscribe=subscribe,
meta=meta, mediainfo=mediainfo)
continue continue
# 过滤 # 过滤搜索结果
matched_contexts = [] matched_contexts = []
for context in contexts: for context in contexts:
torrent_meta = context.meta_info torrent_meta = context.meta_info
@ -304,41 +303,29 @@ class SubscribeChain(ChainBase):
if torrent_meta.episode_list: if torrent_meta.episode_list:
logger.info(f'{subscribe.name} 正在洗版，{torrent_info.title} 不是整季') logger.info(f'{subscribe.name} 正在洗版，{torrent_info.title} 不是整季')
continue continue
# 优先级小于已下载优先级的不要 # 洗版时，优先级小于已下载优先级的不要
if subscribe.current_priority \ if subscribe.current_priority \
and torrent_info.pri_order < subscribe.current_priority: and torrent_info.pri_order < subscribe.current_priority:
logger.info(f'{subscribe.name} 正在洗版，{torrent_info.title} 优先级低于已下载优先级') logger.info(f'{subscribe.name} 正在洗版，{torrent_info.title} 优先级低于已下载优先级')
continue continue
matched_contexts.append(context) matched_contexts.append(context)
if not matched_contexts: if not matched_contexts:
logger.warn(f'订阅 {subscribe.name} 没有符合过滤条件的资源') logger.warn(f'订阅 {subscribe.name} 没有符合过滤条件的资源')
# 非洗版未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数 self.finish_subscribe_or_not(subscribe=subscribe, meta=meta,
if meta.type == MediaType.TV and not subscribe.best_version: mediainfo=mediainfo, lefts=no_exists)
self.__update_lack_episodes(lefts=no_exists, subscribe=subscribe,
meta=meta, mediainfo=mediainfo)
continue continue
# 自动下载 # 自动下载
downloads, lefts = self.downloadchain.batch_download(contexts=matched_contexts, downloads, lefts = self.downloadchain.batch_download(
no_exists=no_exists, username=subscribe.username) contexts=matched_contexts,
# 更新已经下载的集数 no_exists=no_exists,
if downloads \ username=subscribe.username
and meta.type == MediaType.TV \ )
and not subscribe.best_version:
self.__update_subscribe_note(subscribe=subscribe, downloads=downloads)
if downloads and not lefts: # 判断是否应完成订阅
# 判断是否应完成订阅 self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, mediainfo=mediainfo,
self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, downloads=downloads, lefts=lefts)
mediainfo=mediainfo, downloads=downloads)
else:
# 未完成下载
logger.info(f'{mediainfo.title_year} 未下载完整，继续订阅 ...')
if meta.type == MediaType.TV and not subscribe.best_version:
# 更新订阅剩余集数和时间
update_date = True if downloads else False
self.__update_lack_episodes(lefts=lefts, subscribe=subscribe, meta=meta,
mediainfo=mediainfo, update_date=update_date)
# 手动触发时发送系统消息 # 手动触发时发送系统消息
if manual: if manual:
@ -347,35 +334,69 @@ class SubscribeChain(ChainBase):
else: else:
self.message.put('所有订阅搜索完成！') self.message.put('所有订阅搜索完成！')
def finish_subscribe_or_not(self, subscribe: Subscribe, meta: MetaInfo, def update_subscribe_priority(self, subscribe: Subscribe, meta: MetaInfo,
mediainfo: MediaInfo, downloads: List[Context] = None): mediainfo: MediaInfo, downloads: List[Context]):
"""
更新订阅已下载资源的优先级
"""
if not downloads:
return
if not subscribe.best_version:
return
# 当前下载资源的优先级
priority = max([item.torrent_info.pri_order for item in downloads])
if priority == 100:
logger.info(f'{mediainfo.title_year} 洗版完成，删除订阅')
self.subscribeoper.delete(subscribe.id)
# 发送通知
self.post_message(Notification(mtype=NotificationType.Subscribe,
title=f'{mediainfo.title_year} {meta.season} 已洗版完成',
image=mediainfo.get_message_image()))
else:
# 正在洗版，更新资源优先级
logger.info(f'{mediainfo.title_year} 正在洗版，更新资源优先级为 {priority}')
self.subscribeoper.update(subscribe.id, {
"current_priority": priority
})
def finish_subscribe_or_not(self, subscribe: Subscribe, meta: MetaInfo, mediainfo: MediaInfo,
downloads: List[Context] = None,
lefts: Dict[Union[int | str], Dict[int, NotExistMediaInfo]] = None):
""" """
判断是否应完成订阅 判断是否应完成订阅
""" """
if not subscribe.best_version: if not subscribe.best_version:
# 全部下载完成 # 非洗板
logger.info(f'{mediainfo.title_year} 完成订阅') if not lefts:
self.subscribeoper.delete(subscribe.id) # 全部下载完成
# 发送通知 logger.info(f'{mediainfo.title_year} 完成订阅')
self.post_message(Notification(mtype=NotificationType.Subscribe,
title=f'{mediainfo.title_year} {meta.season} 已完成订阅',
image=mediainfo.get_message_image()))
elif downloads:
# 当前下载资源的优先级
priority = max([item.torrent_info.pri_order for item in downloads])
if priority == 100:
logger.info(f'{mediainfo.title_year} 洗版完成，删除订阅')
self.subscribeoper.delete(subscribe.id) self.subscribeoper.delete(subscribe.id)
# 发送通知 # 发送通知
self.post_message(Notification(mtype=NotificationType.Subscribe, self.post_message(Notification(mtype=NotificationType.Subscribe,
title=f'{mediainfo.title_year} {meta.season} 已洗版完成', title=f'{mediainfo.title_year} {meta.season} 已完成订阅',
image=mediainfo.get_message_image())) image=mediainfo.get_message_image()))
elif downloads:
# 下载到了内容但不完整
if meta.type == MediaType.TV:
# 电视剧更新已下载集数
self.__update_subscribe_note(subscribe=subscribe, downloads=downloads)
# 更新订阅剩余集数和时间
self.__update_lack_episodes(lefts=lefts, subscribe=subscribe,
mediainfo=mediainfo, update_date=True)
else: else:
# 正在洗版，更新资源优先级 # 未下载到内容且不完整
logger.info(f'{mediainfo.title_year} 正在洗版，更新资源优先级') logger.info(f'{mediainfo.title_year} 未下载完整，继续订阅 ...')
self.subscribeoper.update(subscribe.id, { if meta.type == MediaType.TV:
"current_priority": priority # 更新订阅剩余集数
}) self.__update_lack_episodes(lefts=lefts, subscribe=subscribe,
mediainfo=mediainfo, update_date=False)
elif downloads:
# 洗板，下载到了内容，更新资源优先级
self.update_subscribe_priority(subscribe=subscribe, meta=meta,
mediainfo=mediainfo, downloads=downloads)
else:
# 洗版，未下载到内容
logger.info(f'{mediainfo.title_year} 继续洗版 ...')
def refresh(self): def refresh(self):
""" """
@ -495,9 +516,11 @@ class SubscribeChain(ChainBase):
meta.type = MediaType(subscribe.type) meta.type = MediaType(subscribe.type)
# 识别媒体信息 # 识别媒体信息
mediainfo: MediaInfo = self.recognize_media(meta=meta, mtype=meta.type, mediainfo: MediaInfo = self.recognize_media(meta=meta, mtype=meta.type,
tmdbid=subscribe.tmdbid, doubanid=subscribe.doubanid) tmdbid=subscribe.tmdbid,
doubanid=subscribe.doubanid)
if not mediainfo: if not mediainfo:
logger.warn(f'未识别到媒体信息，标题：{subscribe.name}，tmdbid：{subscribe.tmdbid}，doubanid：{subscribe.doubanid}') logger.warn(
f'未识别到媒体信息，标题：{subscribe.name}，tmdbid：{subscribe.tmdbid}，doubanid：{subscribe.doubanid}')
continue continue
# 非洗版 # 非洗版
if not subscribe.best_version: if not subscribe.best_version:
@ -537,7 +560,7 @@ class SubscribeChain(ChainBase):
# 电视剧订阅 # 电视剧订阅
if meta.type == MediaType.TV: if meta.type == MediaType.TV:
# 使用订阅的总集数和开始集数替换no_exists # 整合实际缺失集与订阅开始集结束集
no_exists = self.__get_subscribe_no_exits( no_exists = self.__get_subscribe_no_exits(
no_exists=no_exists, no_exists=no_exists,
mediakey=mediakey, mediakey=mediakey,
@ -546,7 +569,7 @@ class SubscribeChain(ChainBase):
start_episode=subscribe.start_episode, start_episode=subscribe.start_episode,
) )
# 打印缺失集信息 # 打印汇总缺失集信息
if no_exists and no_exists.get(mediakey): if no_exists and no_exists.get(mediakey):
no_exists_info = no_exists.get(mediakey).get(subscribe.season) no_exists_info = no_exists.get(mediakey).get(subscribe.season)
if no_exists_info: if no_exists_info:
@ -633,35 +656,31 @@ class SubscribeChain(ChainBase):
filter_rule=filter_rule): filter_rule=filter_rule):
continue continue
# 洗版时，优先级小于已下载优先级的不要
if subscribe.best_version:
if subscribe.current_priority \
and torrent_info.pri_order < subscribe.current_priority:
logger.info(f'{subscribe.name} 正在洗版，{torrent_info.title} 优先级低于已下载优先级')
continue
# 匹配成功 # 匹配成功
logger.info(f'{mediainfo.title_year} 匹配成功：{torrent_info.title}') logger.info(f'{mediainfo.title_year} 匹配成功：{torrent_info.title}')
_match_context.append(context) _match_context.append(context)
# 开始下载 if not _match_context:
logger.info(f'{mediainfo.title_year} 匹配完成，共匹配到{len(_match_context)}个资源') # 未匹配到资源
if _match_context: logger.info(f'{mediainfo.title_year} 未匹配到符合条件的资源')
# 批量择优下载 self.finish_subscribe_or_not(subscribe=subscribe, meta=meta,
downloads, lefts = self.downloadchain.batch_download(contexts=_match_context, no_exists=no_exists, mediainfo=mediainfo, lefts=no_exists)
username=subscribe.username) continue
# 更新已经下载的集数
if downloads and meta.type == MediaType.TV:
self.__update_subscribe_note(subscribe=subscribe, downloads=downloads)
if downloads and not lefts: # 开始批量择优下载
# 判断是否要完成订阅 logger.info(f'{mediainfo.title_year} 匹配完成，共匹配到{len(_match_context)}个资源')
self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, downloads, lefts = self.downloadchain.batch_download(contexts=_match_context, no_exists=no_exists,
mediainfo=mediainfo, downloads=downloads) username=subscribe.username)
else: # 判断是否要完成订阅
if meta.type == MediaType.TV and not subscribe.best_version: self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, mediainfo=mediainfo,
update_date = True if downloads else False downloads=downloads, lefts=lefts)
# 未完成下载，计算剩余集数
self.__update_lack_episodes(lefts=lefts, subscribe=subscribe, meta=meta,
mediainfo=mediainfo, update_date=update_date)
else:
if meta.type == MediaType.TV:
# 未搜索到资源，但本地缺失可能有变化，更新订阅剩余集数
self.__update_lack_episodes(lefts=no_exists, subscribe=subscribe,
meta=meta, mediainfo=mediainfo)
def check(self): def check(self):
""" """
@ -684,7 +703,8 @@ class SubscribeChain(ChainBase):
mediainfo: MediaInfo = self.recognize_media(meta=meta, mtype=meta.type, mediainfo: MediaInfo = self.recognize_media(meta=meta, mtype=meta.type,
tmdbid=subscribe.tmdbid, doubanid=subscribe.doubanid) tmdbid=subscribe.tmdbid, doubanid=subscribe.doubanid)
if not mediainfo: if not mediainfo:
logger.warn(f'未识别到媒体信息，标题：{subscribe.name}，tmdbid：{subscribe.tmdbid}，doubanid：{subscribe.doubanid}') logger.warn(
f'未识别到媒体信息，标题：{subscribe.name}，tmdbid：{subscribe.tmdbid}，doubanid：{subscribe.doubanid}')
continue continue
# 对于电视剧，获取当前季的总集数 # 对于电视剧，获取当前季的总集数
episodes = mediainfo.seasons.get(subscribe.season) or [] episodes = mediainfo.seasons.get(subscribe.season) or []
@ -756,14 +776,15 @@ class SubscribeChain(ChainBase):
return True return True
return False return False
def __update_lack_episodes(self, lefts: Dict[int, Dict[int, NotExistMediaInfo]], def __update_lack_episodes(self, lefts: Dict[Union[int, str], Dict[int, NotExistMediaInfo]],
subscribe: Subscribe, subscribe: Subscribe,
meta: MetaBase,
mediainfo: MediaInfo, mediainfo: MediaInfo,
update_date: bool = False): update_date: bool = False):
""" """
更新订阅剩余集数 更新订阅剩余集数
""" """
if not lefts:
return
mediakey = subscribe.tmdbid or subscribe.doubanid mediakey = subscribe.tmdbid or subscribe.doubanid
left_seasons = lefts.get(mediakey) left_seasons = lefts.get(mediakey)
if left_seasons: if left_seasons:
@ -786,9 +807,6 @@ class SubscribeChain(ChainBase):
self.subscribeoper.update(subscribe.id, { self.subscribeoper.update(subscribe.id, {
"lack_episode": lack_episode "lack_episode": lack_episode
}) })
else:
# 判断是否应完成订阅
self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, mediainfo=mediainfo)
def remote_list(self, channel: MessageChannel, userid: Union[str, int] = None): def remote_list(self, channel: MessageChannel, userid: Union[str, int] = None):
""" """
@ -850,7 +868,7 @@ class SubscribeChain(ChainBase):
self.remote_list(channel, userid) self.remote_list(channel, userid)
@staticmethod @staticmethod
def __get_subscribe_no_exits(no_exists: Dict[int, Dict[int, NotExistMediaInfo]], def __get_subscribe_no_exits(no_exists: Dict[Union[int, str], Dict[int, NotExistMediaInfo]],
mediakey: Union[str, int], mediakey: Union[str, int],
begin_season: int, begin_season: int,
total_episode: int, total_episode: int,