From bf63be18e4f5d5d28cb45477dfbc35e86bcff5e9 Mon Sep 17 00:00:00 2001 From: InfinityPacer <160988576+InfinityPacer@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:34:44 +0800 Subject: [PATCH 1/2] fix(cache): enhance fanart image caching --- app/modules/fanart/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/modules/fanart/__init__.py b/app/modules/fanart/__init__.py index 93d13ecc..2d5f5cbd 100644 --- a/app/modules/fanart/__init__.py +++ b/app/modules/fanart/__init__.py @@ -420,7 +420,7 @@ class FanartModule(_ModuleBase): return result @classmethod - @cached(maxsize=settings.CACHE_CONF["fanart"], ttl=settings.CACHE_CONF["meta"]) + @cached(maxsize=settings.CACHE_CONF["fanart"], ttl=settings.CACHE_CONF["meta"], skip_none=False) def __request_fanart(cls, media_type: MediaType, queryid: Union[str, int]) -> Optional[dict]: if media_type == MediaType.MOVIE: image_url = cls._movie_url % queryid From d35bee54a639d618311c0c0233fdceacf62b5325 Mon Sep 17 00:00:00 2001 From: InfinityPacer <160988576+InfinityPacer@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:34:59 +0800 Subject: [PATCH 2/2] fix(limit): log accurate wait time after triggering limit --- app/utils/limit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/utils/limit.py b/app/utils/limit.py index 27dc7fcd..bec915da 100644 --- a/app/utils/limit.py +++ b/app/utils/limit.py @@ -156,7 +156,8 @@ class ExponentialBackoffRateLimiter(BaseRateLimiter): with self.lock: self.next_allowed_time = current_time + self.current_wait self.current_wait = min(self.current_wait * self.backoff_factor, self.max_wait) - self.log_warning(f"触发限流,将在 {self.current_wait} 秒后允许继续调用") + wait_time = self.next_allowed_time - current_time + self.log_warning(f"触发限流,将在 {wait_time:.2f} 秒后允许继续调用") # 时间窗口限流器