refactor: inject CookieCloud runtime settings

This commit is contained in:
jxxghp
2026-08-23 01:32:56 +08:00
parent 60a54cf4dc
commit 09cfd71649
4 changed files with 23 additions and 12 deletions
+16 -6
View File
@@ -1,7 +1,8 @@
import json
import importlib
from typing import Any, Dict, Tuple, Optional
from app.runtime.config import settings
from app.application.configuration import get_runtime_settings
from app.runtime.log import logger
from app.foundation.crypto import CryptoJsUtils, HashUtils
from app.adapters.network.http import RequestUtils
@@ -10,6 +11,15 @@ from app.foundation import text as text_tools
from app.foundation.url import UrlUtils
def _runtime_setting(key: str) -> Any:
"""读取 CookieCloud 配置服务,未装配时回退旧 Settings ABI。"""
try:
return get_runtime_settings().get(key)
except RuntimeError:
legacy_settings = importlib.import_module("app.runtime.config").settings
return getattr(legacy_settings, key)
class CookieCloudHelper:
"""负责 CookieCloud 配置同步、下载和本地数据解析。"""
@@ -23,11 +33,11 @@ class CookieCloudHelper:
"""
同步CookieCloud配置项
"""
self._server = UrlUtils.standardize_base_url(settings.COOKIECLOUD_HOST)
self._key = text_tools.strip_optional(settings.COOKIECLOUD_KEY)
self._password = text_tools.strip_optional(settings.COOKIECLOUD_PASSWORD)
self._enable_local = settings.COOKIECLOUD_ENABLE_LOCAL
self._local_path = settings.COOKIE_PATH
self._server = UrlUtils.standardize_base_url(_runtime_setting("COOKIECLOUD_HOST"))
self._key = text_tools.strip_optional(_runtime_setting("COOKIECLOUD_KEY"))
self._password = text_tools.strip_optional(_runtime_setting("COOKIECLOUD_PASSWORD"))
self._enable_local = _runtime_setting("COOKIECLOUD_ENABLE_LOCAL")
self._local_path = _runtime_setting("COOKIE_PATH")
def download(self) -> Tuple[Optional[dict], str]:
"""