mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-06 07:56:52 +08:00
fix pool size
This commit is contained in:
@@ -179,7 +179,7 @@ class TorrentsChain(ChainBase):
|
|||||||
# 按pubdate降序排列
|
# 按pubdate降序排列
|
||||||
torrents.sort(key=lambda x: x.pubdate or '', reverse=True)
|
torrents.sort(key=lambda x: x.pubdate or '', reverse=True)
|
||||||
# 取前N条
|
# 取前N条
|
||||||
torrents = torrents[:settings.CACHE_CONF["refresh"]]
|
torrents = torrents[:settings.CONF["refresh"]]
|
||||||
if torrents:
|
if torrents:
|
||||||
# 过滤出没有处理过的种子 - 优化:使用集合查找,避免重复创建字符串列表
|
# 过滤出没有处理过的种子 - 优化:使用集合查找,避免重复创建字符串列表
|
||||||
cached_signatures = {f'{t.torrent_info.title}{t.torrent_info.description}'
|
cached_signatures = {f'{t.torrent_info.title}{t.torrent_info.description}'
|
||||||
@@ -219,8 +219,8 @@ class TorrentsChain(ChainBase):
|
|||||||
else:
|
else:
|
||||||
torrents_cache[domain].append(context)
|
torrents_cache[domain].append(context)
|
||||||
# 如果超过了限制条数则移除掉前面的
|
# 如果超过了限制条数则移除掉前面的
|
||||||
if len(torrents_cache[domain]) > settings.CACHE_CONF["torrents"]:
|
if len(torrents_cache[domain]) > settings.CONF["torrents"]:
|
||||||
torrents_cache[domain] = torrents_cache[domain][-settings.CACHE_CONF["torrents"]:]
|
torrents_cache[domain] = torrents_cache[domain][-settings.CONF["torrents"]:]
|
||||||
else:
|
else:
|
||||||
logger.info(f'{indexer.get("name")} 没有获取到种子')
|
logger.info(f'{indexer.get("name")} 没有获取到种子')
|
||||||
|
|
||||||
|
|||||||
+10
-4
@@ -522,7 +522,7 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
|
|||||||
return self.CONFIG_PATH / "cookies"
|
return self.CONFIG_PATH / "cookies"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def CACHE_CONF(self):
|
def CONF(self):
|
||||||
"""
|
"""
|
||||||
{
|
{
|
||||||
"torrents": "缓存种子数量",
|
"torrents": "缓存种子数量",
|
||||||
@@ -531,7 +531,9 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
|
|||||||
"douban": "豆瓣请求缓存数量",
|
"douban": "豆瓣请求缓存数量",
|
||||||
"fanart": "Fanart请求缓存数量",
|
"fanart": "Fanart请求缓存数量",
|
||||||
"meta": "元数据缓存过期时间(秒)",
|
"meta": "元数据缓存过期时间(秒)",
|
||||||
"memory": "最大占用内存(MB)"
|
"memory": "最大占用内存(MB)",
|
||||||
|
"scheduler": "调度器缓存数量"
|
||||||
|
"threadpool": "线程池数量"
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
if self.BIG_MEMORY_MODE:
|
if self.BIG_MEMORY_MODE:
|
||||||
@@ -543,7 +545,9 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
|
|||||||
"bangumi": 512,
|
"bangumi": 512,
|
||||||
"fanart": 512,
|
"fanart": 512,
|
||||||
"meta": (self.META_CACHE_EXPIRE or 24) * 3600,
|
"meta": (self.META_CACHE_EXPIRE or 24) * 3600,
|
||||||
"memory": 2 * 1024
|
"memory": 2 * 1024,
|
||||||
|
"scheduler": 50,
|
||||||
|
"threadpool": 50
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
"torrents": 100,
|
"torrents": 100,
|
||||||
@@ -553,7 +557,9 @@ class Settings(BaseSettings, ConfigModel, LogConfigModel):
|
|||||||
"bangumi": 256,
|
"bangumi": 256,
|
||||||
"fanart": 128,
|
"fanart": 128,
|
||||||
"meta": (self.META_CACHE_EXPIRE or 2) * 3600,
|
"meta": (self.META_CACHE_EXPIRE or 2) * 3600,
|
||||||
"memory": 1024
|
"memory": 1024,
|
||||||
|
"scheduler": 20,
|
||||||
|
"threadpool": 20
|
||||||
}
|
}
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
@@ -2,14 +2,15 @@ from concurrent.futures import ThreadPoolExecutor
|
|||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from app.utils.singleton import Singleton
|
from app.utils.singleton import Singleton
|
||||||
|
from core.config import settings
|
||||||
|
|
||||||
|
|
||||||
class ThreadHelper(metaclass=Singleton):
|
class ThreadHelper(metaclass=Singleton):
|
||||||
"""
|
"""
|
||||||
线程池管理
|
线程池管理
|
||||||
"""
|
"""
|
||||||
def __init__(self, max_workers: Optional[int] = 50):
|
def __init__(self):
|
||||||
self.pool = ThreadPoolExecutor(max_workers=max_workers)
|
self.pool = ThreadPoolExecutor(max_workers=settings.CONF['threadpool'])
|
||||||
|
|
||||||
def submit(self, func, *args, **kwargs):
|
def submit(self, func, *args, **kwargs):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ class BangumiApi(object):
|
|||||||
self._session = requests.Session()
|
self._session = requests.Session()
|
||||||
self._req = RequestUtils(session=self._session)
|
self._req = RequestUtils(session=self._session)
|
||||||
|
|
||||||
@cached(maxsize=settings.CACHE_CONF["bangumi"], ttl=settings.CACHE_CONF["meta"])
|
@cached(maxsize=settings.CONF["bangumi"], ttl=settings.CONF["meta"])
|
||||||
def __invoke(self, url, key: Optional[str] = None, **kwargs):
|
def __invoke(self, url, key: Optional[str] = None, **kwargs):
|
||||||
req_url = self._base_url + url
|
req_url = self._base_url + url
|
||||||
params = {}
|
params = {}
|
||||||
|
|||||||
@@ -171,14 +171,14 @@ class DoubanApi(metaclass=Singleton):
|
|||||||
).digest()
|
).digest()
|
||||||
).decode()
|
).decode()
|
||||||
|
|
||||||
@cached(maxsize=settings.CACHE_CONF["douban"], ttl=settings.CACHE_CONF["meta"])
|
@cached(maxsize=settings.CONF["douban"], ttl=settings.CONF["meta"])
|
||||||
def __invoke_recommend(self, url: str, **kwargs) -> dict:
|
def __invoke_recommend(self, url: str, **kwargs) -> dict:
|
||||||
"""
|
"""
|
||||||
推荐/发现类API
|
推荐/发现类API
|
||||||
"""
|
"""
|
||||||
return self.__invoke(url, **kwargs)
|
return self.__invoke(url, **kwargs)
|
||||||
|
|
||||||
@cached(maxsize=settings.CACHE_CONF["douban"], ttl=settings.CACHE_CONF["meta"])
|
@cached(maxsize=settings.CONF["douban"], ttl=settings.CONF["meta"])
|
||||||
def __invoke_search(self, url: str, **kwargs) -> dict:
|
def __invoke_search(self, url: str, **kwargs) -> dict:
|
||||||
"""
|
"""
|
||||||
搜索类API
|
搜索类API
|
||||||
@@ -213,7 +213,7 @@ class DoubanApi(metaclass=Singleton):
|
|||||||
return resp.json()
|
return resp.json()
|
||||||
return resp.json() if resp else {}
|
return resp.json() if resp else {}
|
||||||
|
|
||||||
@cached(maxsize=settings.CACHE_CONF["douban"], ttl=settings.CACHE_CONF["meta"])
|
@cached(maxsize=settings.CONF["douban"], ttl=settings.CONF["meta"])
|
||||||
def __post(self, url: str, **kwargs) -> dict:
|
def __post(self, url: str, **kwargs) -> dict:
|
||||||
"""
|
"""
|
||||||
POST请求
|
POST请求
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ from app.schemas.types import MediaType
|
|||||||
lock = RLock()
|
lock = RLock()
|
||||||
|
|
||||||
CACHE_EXPIRE_TIMESTAMP_STR = "cache_expire_timestamp"
|
CACHE_EXPIRE_TIMESTAMP_STR = "cache_expire_timestamp"
|
||||||
EXPIRE_TIMESTAMP = settings.CACHE_CONF["meta"]
|
EXPIRE_TIMESTAMP = settings.CONF["meta"]
|
||||||
|
|
||||||
|
|
||||||
class DoubanCache(metaclass=Singleton):
|
class DoubanCache(metaclass=Singleton):
|
||||||
|
|||||||
@@ -420,7 +420,7 @@ class FanartModule(_ModuleBase):
|
|||||||
return result
|
return result
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@cached(maxsize=settings.CACHE_CONF["fanart"], ttl=settings.CACHE_CONF["meta"])
|
@cached(maxsize=settings.CONF["fanart"], ttl=settings.CONF["meta"])
|
||||||
def __request_fanart(cls, media_type: MediaType, queryid: Union[str, int]) -> Optional[dict]:
|
def __request_fanart(cls, media_type: MediaType, queryid: Union[str, int]) -> Optional[dict]:
|
||||||
if media_type == MediaType.MOVIE:
|
if media_type == MediaType.MOVIE:
|
||||||
image_url = cls._movie_url % queryid
|
image_url = cls._movie_url % queryid
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ from app.schemas.types import MediaType
|
|||||||
lock = RLock()
|
lock = RLock()
|
||||||
|
|
||||||
CACHE_EXPIRE_TIMESTAMP_STR = "cache_expire_timestamp"
|
CACHE_EXPIRE_TIMESTAMP_STR = "cache_expire_timestamp"
|
||||||
EXPIRE_TIMESTAMP = settings.CACHE_CONF["meta"]
|
EXPIRE_TIMESTAMP = settings.CONF["meta"]
|
||||||
|
|
||||||
|
|
||||||
class TmdbCache(metaclass=Singleton):
|
class TmdbCache(metaclass=Singleton):
|
||||||
|
|||||||
@@ -500,7 +500,7 @@ class TmdbApi:
|
|||||||
|
|
||||||
return ret_info
|
return ret_info
|
||||||
|
|
||||||
@cached(maxsize=settings.CACHE_CONF["tmdb"], ttl=settings.CACHE_CONF["meta"])
|
@cached(maxsize=settings.CONF["tmdb"], ttl=settings.CONF["meta"])
|
||||||
@rate_limit_exponential(source="match_tmdb_web", base_wait=5, max_wait=1800, enable_logging=True)
|
@rate_limit_exponential(source="match_tmdb_web", base_wait=5, max_wait=1800, enable_logging=True)
|
||||||
def match_web(self, name: str, mtype: MediaType) -> Optional[dict]:
|
def match_web(self, name: str, mtype: MediaType) -> Optional[dict]:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ class TMDb(object):
|
|||||||
def cache(self, cache):
|
def cache(self, cache):
|
||||||
self._cache_enabled = bool(cache)
|
self._cache_enabled = bool(cache)
|
||||||
|
|
||||||
@cached(maxsize=settings.CACHE_CONF["tmdb"], ttl=settings.CACHE_CONF["meta"])
|
@cached(maxsize=settings.CONF["tmdb"], ttl=settings.CONF["meta"])
|
||||||
def cached_request(self, method, url, data, json,
|
def cached_request(self, method, url, data, json,
|
||||||
_ts=datetime.strftime(datetime.now(), '%Y%m%d')):
|
_ts=datetime.strftime(datetime.now(), '%Y%m%d')):
|
||||||
"""
|
"""
|
||||||
|
|||||||
+2
-2
@@ -166,7 +166,7 @@ class Scheduler(metaclass=Singleton):
|
|||||||
# 创建定时服务
|
# 创建定时服务
|
||||||
self._scheduler = BackgroundScheduler(timezone=settings.TZ,
|
self._scheduler = BackgroundScheduler(timezone=settings.TZ,
|
||||||
executors={
|
executors={
|
||||||
'default': ThreadPoolExecutor(20)
|
'default': ThreadPoolExecutor(settings.CONF['scheduler'])
|
||||||
})
|
})
|
||||||
|
|
||||||
# CookieCloud定时同步
|
# CookieCloud定时同步
|
||||||
@@ -323,7 +323,7 @@ class Scheduler(metaclass=Singleton):
|
|||||||
"interval",
|
"interval",
|
||||||
id="clear_cache",
|
id="clear_cache",
|
||||||
name="缓存清理",
|
name="缓存清理",
|
||||||
hours=settings.CACHE_CONF["meta"] / 3600,
|
hours=settings.CONF["meta"] / 3600,
|
||||||
kwargs={
|
kwargs={
|
||||||
'job_id': 'clear_cache'
|
'job_id': 'clear_cache'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ def init_memory_manager():
|
|||||||
"""
|
"""
|
||||||
memory_manager = MemoryHelper()
|
memory_manager = MemoryHelper()
|
||||||
# 设置内存阈值和启动监控
|
# 设置内存阈值和启动监控
|
||||||
memory_manager.set_threshold(settings.CACHE_CONF['memory'])
|
memory_manager.set_threshold(settings.CONF['memory'])
|
||||||
memory_manager.start_monitoring()
|
memory_manager.start_monitoring()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -27,3 +27,5 @@ DB_MAX_OVERFLOW=500
|
|||||||
DB_TIMEOUT=60
|
DB_TIMEOUT=60
|
||||||
# 是否开发调试模式,仅开发人员使用,打开后将停止后台服务
|
# 是否开发调试模式,仅开发人员使用,打开后将停止后台服务
|
||||||
DEV=false
|
DEV=false
|
||||||
|
API_TOKEN='jYImOhUt6p4acOeMpNgDhA'
|
||||||
|
ANIME_GENREIDS='[16]'
|
||||||
|
|||||||
Reference in New Issue
Block a user