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 2024-01-03 17:40:13 +08:00
parent 11d29919bf
commit a9932d0866
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/chain/search.py
View File

@ -153,8 +153,8 @@ class SearchChain(ChainBase):
return [] return []
# 使用过滤规则再次过滤 # 使用过滤规则再次过滤
torrents = self.filter_torrents_by_rule(torrents=torrents, torrents = self.filter_torrents_by_rule(torrents=torrents,
filter_rule=filter_rule, mediainfo=mediainfo,
seasons=mediainfo.seasons) filter_rule=filter_rule)
if not torrents: if not torrents:
logger.warn(f'{keyword or mediainfo.title} 没有符合过滤规则的资源') logger.warn(f'{keyword or mediainfo.title} 没有符合过滤规则的资源')
return [] return []
@ -337,14 +337,14 @@ class SearchChain(ChainBase):
def filter_torrents_by_rule(self, def filter_torrents_by_rule(self,
torrents: List[TorrentInfo], torrents: List[TorrentInfo],
mediainfo: MediaInfo,
filter_rule: Dict[str, str] = None, filter_rule: Dict[str, str] = None,
seasons: Dict[int, list] = None,
) -> List[TorrentInfo]: ) -> List[TorrentInfo]:
""" """
使用过滤规则过滤种子 使用过滤规则过滤种子
:param torrents: 种子列表 :param torrents: 种子列表
:param filter_rule: 过滤规则 :param filter_rule: 过滤规则
:param seasons: 季集信息 :param mediainfo: 媒体信息
""" """
if not filter_rule: if not filter_rule:
@ -362,8 +362,10 @@ class SearchChain(ChainBase):
resolution = filter_rule.get("resolution") resolution = filter_rule.get("resolution")
# 特效 # 特效
effect = filter_rule.get("effect") effect = filter_rule.get("effect")
# 大小 # 电影大小
size = filter_rule.get("size") movie_size = filter_rule.get("movie_size")
# 剧集单集大小
tv_size = filter_rule.get("tv_size")
def __get_size_range(size_str: str) -> Tuple[float, float]: def __get_size_range(size_str: str) -> Tuple[float, float]:
""" """
@ -414,13 +416,17 @@ class SearchChain(ChainBase):
return False return False
# 大小 # 大小
if size: if movie_size or tv_size:
if mediainfo.type == MediaType.TV:
size = tv_size
else:
size = movie_size
# 大小范围 # 大小范围
begin_size, end_size = __get_size_range(size) begin_size, end_size = __get_size_range(size)
if begin_size and end_size: if begin_size and end_size:
meta = MetaInfo(title=t.title, subtitle=t.description) meta = MetaInfo(title=t.title, subtitle=t.description)
# 集数 # 集数
if meta.type == MediaType.TV: if mediainfo.type == MediaType.TV:
# 电视剧 # 电视剧
season = meta.begin_season or 1 season = meta.begin_season or 1
if meta.total_episode: if meta.total_episode:
@ -428,15 +434,17 @@ class SearchChain(ChainBase):
episodes_num = meta.total_episode episodes_num = meta.total_episode
else: else:
# 整季集数 # 整季集数
episodes_num = len(seasons.get(season) or [1]) if seasons else 1 episodes_num = len(mediainfo.seasons.get(season) or [1])
# 比较大小
if not (begin_size * 1024 ** 3 <= (t.size / episodes_num) <= end_size * 1024 ** 3):
logger.info(f"{t.title} {StringUtils.str_filesize(t.size)} "
f"共{episodes_num}集，不匹配大小规则 {size}")
return False
else: else:
# 电影 # 电影比较大小
episodes_num = 1 if not (begin_size * 1024 ** 3 <= t.size <= end_size * 1024 ** 3):
# 比较大小 logger.info(f"{t.title} {StringUtils.str_filesize(t.size)} 不匹配大小规则 {size}")
if not (begin_size * 1024 ** 3 <= (t.size / episodes_num) <= end_size * 1024 ** 3): return False
logger.info(f"{t.title} {StringUtils.str_filesize(t.size)} 不匹配大小规则 {size}")
return False
return True return True
# 使用默认过滤规则再次过滤 # 使用默认过滤规则再次过滤