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

fix bug

Browse Source
This commit is contained in:
jxxghp 2023-09-22 12:52:40 +08:00
parent fed754f03a
commit dc41f4946a
2 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/chain/search.py
View File

@ -141,10 +141,13 @@ class SearchChain(ChainBase):
if result is not None: if result is not None:
torrents = result torrents = result
if not torrents: if not torrents:
logger.warn(f'{keyword or mediainfo.title} 没有符合过滤条件的资源') logger.warn(f'{keyword or mediainfo.title} 没有符合优先级规则的资源')
return [] return []
# 使用默认过滤规则再次过滤 # 使用默认过滤规则再次过滤
torrents = self.filter_torrents_by_default_rule(torrents, keyword, mediainfo) torrents = self.filter_torrents_by_default_rule(torrents)
if not torrents:
logger.warn(f'{keyword or mediainfo.title} 没有符合默认过滤规则的资源')
return []
# 匹配的资源 # 匹配的资源
_match_torrents = [] _match_torrents = []
# 总数 # 总数
@ -312,15 +315,16 @@ class SearchChain(ChainBase):
return results return results
def filter_torrents_by_default_rule(self, def filter_torrents_by_default_rule(self,
torrents: List[TorrentInfo], torrents: List[TorrentInfo]) -> List[TorrentInfo]:
keyword: str,
mediainfo: MediaInfo) -> List[TorrentInfo]: # 取默认过滤规则
default_include_exclude = self.systemconfig.get(SystemConfigKey.DefaultIncludeExcludeFilter) or {}
if not default_include_exclude:
return torrents
include = default_include_exclude.get("include")
exclude = default_include_exclude.get("exclude")
new_torrents = [] new_torrents = []
for torrent in torrents: for torrent in torrents:
# 取默认过滤规则
default_include_exclude = self.systemconfig.get(SystemConfigKey.DefaultIncludeExcludeFilter) or {}
include = default_include_exclude.get("include")
exclude = default_include_exclude.get("exclude")
# 包含 # 包含
if include: if include:
if not re.search(r"%s" % include, if not re.search(r"%s" % include,
@ -334,7 +338,4 @@ class SearchChain(ChainBase):
logger.info(f"{torrent.title} 匹配排除规则 {exclude}") logger.info(f"{torrent.title} 匹配排除规则 {exclude}")
continue continue
new_torrents.append(torrent) new_torrents.append(torrent)
if not new_torrents:
logger.warn(f'{keyword or mediainfo.title} 没有符合过滤条件的资源')
return []
return new_torrents return new_torrents

24
app/chain/subscribe.py
View File

@ -285,22 +285,6 @@ class SubscribeChain(ChainBase):
torrent_meta = context.meta_info torrent_meta = context.meta_info
torrent_info = context.torrent_info torrent_info = context.torrent_info
torrent_mediainfo = context.media_info torrent_mediainfo = context.media_info
# 包含与排除规则
default_include_exclude = self.systemconfig.get(SystemConfigKey.DefaultIncludeExcludeFilter) or {}
include = subscribe.include or default_include_exclude.get("include")
exclude = subscribe.exclude or default_include_exclude.get("exclude")
# 包含
if include:
if not re.search(r"%s" % include,
f"{torrent_info.title} {torrent_info.description}", re.I):
logger.info(f"{torrent_info.title} 不匹配包含规则 {include}")
continue
# 排除
if exclude:
if re.search(r"%s" % exclude,
f"{torrent_info.title} {torrent_info.description}", re.I):
logger.info(f"{torrent_info.title} 匹配排除规则 {exclude}")
continue
# 非洗版 # 非洗版
if not subscribe.best_version: if not subscribe.best_version:
# 如果是电视剧过滤掉已经下载的集数 # 如果是电视剧过滤掉已经下载的集数
@ -493,6 +477,10 @@ class SubscribeChain(ChainBase):
} }
else: else:
no_exists = {} no_exists = {}
# 包含与排除规则
default_include_exclude = self.systemconfig.get(SystemConfigKey.DefaultIncludeExcludeFilter) or {}
include = subscribe.include or default_include_exclude.get("include")
exclude = subscribe.exclude or default_include_exclude.get("exclude")
# 遍历缓存种子 # 遍历缓存种子
_match_context = [] _match_context = []
for domain, contexts in torrents.items(): for domain, contexts in torrents.items():
@ -564,10 +552,6 @@ 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
# 包含与排除规则
default_include_exclude = self.systemconfig.get(SystemConfigKey.DefaultIncludeExcludeFilter) or {}
include = subscribe.include or default_include_exclude.get("include")
exclude = subscribe.exclude or default_include_exclude.get("exclude")
# 包含 # 包含
if include: if include:
if not re.search(r"%s" % include, if not re.search(r"%s" % include,