GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-08-28 11:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 订阅匹配缓存问题

Browse Source
This commit is contained in:
jxxghp
2025-01-13 12:11:56 +08:00
parent bb356ffcee
commit 4f2a110b5f
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/chain/subscribe.py
+26 -30
View File
@@ -6,8 +6,6 @@ import time
from datetime import datetime from datetime import datetime
from typing import Dict, List, Optional, Union, Tuple from typing import Dict, List, Optional, Union, Tuple
from cachetools import TTLCache
from app.chain import ChainBase from app.chain import ChainBase
from app.chain.download import DownloadChain from app.chain.download import DownloadChain
from app.chain.media import MediaChain from app.chain.media import MediaChain
@@ -509,9 +507,6 @@ class SubscribeChain(ChainBase, metaclass=Singleton):
logger.warn('没有缓存资源，无法匹配订阅') logger.warn('没有缓存资源，无法匹配订阅')
return return
# 记录重新识别过的种子
_recognize_cached = TTLCache(maxsize=1024, ttl=6 * 3600)
with self._rlock: with self._rlock:
logger.debug(f"match lock acquired at {datetime.now()}") logger.debug(f"match lock acquired at {datetime.now()}")
# 所有订阅 # 所有订阅
@@ -552,6 +547,12 @@ class SubscribeChain(ChainBase, metaclass=Singleton):
if exist_flag: if exist_flag:
continue continue
# 订阅识别词
if subscribe.custom_words:
custom_words_list = subscribe.custom_words.split("\n")
else:
custom_words_list = None
# 遍历缓存种子 # 遍历缓存种子
_match_context = [] _match_context = []
for domain, contexts in torrents.items(): for domain, contexts in torrents.items():
@@ -573,8 +574,7 @@ class SubscribeChain(ChainBase, metaclass=Singleton):
continue continue
# 有自定义识别词时，需要判断是否需要重新识别 # 有自定义识别词时，需要判断是否需要重新识别
if subscribe.custom_words: if custom_words_list:
custom_words_list = subscribe.custom_words.split("\n")
_, apply_words = WordsMatcher().prepare(torrent_info.title, _, apply_words = WordsMatcher().prepare(torrent_info.title,
custom_words=custom_words_list) custom_words=custom_words_list)
if apply_words: if apply_words:
@@ -589,30 +589,26 @@ class SubscribeChain(ChainBase, metaclass=Singleton):
# 先判断是否有没识别的种子，否则重新识别 # 先判断是否有没识别的种子，否则重新识别
if not torrent_mediainfo \ if not torrent_mediainfo \
or (not torrent_mediainfo.tmdb_id and not torrent_mediainfo.douban_id): or (not torrent_mediainfo.tmdb_id and not torrent_mediainfo.douban_id):
# 避免重复处理 # 重新识别媒体信息
_cache_key = f"{torrent_meta.org_string}_{torrent_info.description}" torrent_mediainfo = self.recognize_media(meta=torrent_meta)
if not _recognize_cached.get(_cache_key): if torrent_mediainfo:
_recognize_cached[_cache_key] = True # 更新种子缓存
# 重新识别媒体信息 context.media_info = torrent_mediainfo
torrent_mediainfo = self.recognize_media(meta=torrent_meta) if not torrent_mediainfo:
if torrent_mediainfo: # 通过标题匹配兜底
logger.warn(
f'{torrent_info.site_name} - {torrent_info.title} 重新识别失败，尝试通过标题匹配...')
if self.torrenthelper.match_torrent(mediainfo=mediainfo,
torrent_meta=torrent_meta,
torrent=torrent_info):
# 匹配成功
logger.info(
f'{mediainfo.title_year} 通过标题匹配到可选资源：{torrent_info.site_name} - {torrent_info.title}')
# 更新种子缓存 # 更新种子缓存
context.media_info = torrent_mediainfo torrent_mediainfo = mediainfo
if not torrent_mediainfo: context.media_info = mediainfo
# 通过标题匹配兜底 else:
logger.warn( continue
f'{torrent_info.site_name} - {torrent_info.title} 重新识别失败，尝试通过标题匹配...')
if self.torrenthelper.match_torrent(mediainfo=mediainfo,
torrent_meta=torrent_meta,
torrent=torrent_info):
# 匹配成功
logger.info(
f'{mediainfo.title_year} 通过标题匹配到可选资源：{torrent_info.site_name} - {torrent_info.title}')
# 更新种子缓存
torrent_mediainfo = mediainfo
context.media_info = mediainfo
else:
continue
# 直接比对媒体信息 # 直接比对媒体信息
if torrent_mediainfo and (torrent_mediainfo.tmdb_id or torrent_mediainfo.douban_id): if torrent_mediainfo and (torrent_mediainfo.tmdb_id or torrent_mediainfo.douban_id):