GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-06 07:56:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): retire RuntimeSettingsCompat host usage

Browse Source
This commit is contained in:
jxxghp
2026-08-26 15:55:21 +08:00
parent cdab54254d
commit 9dbe424c3d
162 changed files with 1966 additions and 1745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/adapters/system/fsproxy.py
+6 -6
View File
@@ -27,10 +27,8 @@ import threading
from pathlib import Path
from typing import Any, Callable, Dict, List, Optional, Union
from app.runtime.settings import RuntimeSettingsCompat
settings = RuntimeSettingsCompat()
from app.runtime.log import logger
from app.runtime.settings import get_runtime_setting
# worker 脚本路径。用绝对路径直接执行，而不是 -m 或 import：
# 直接执行文件不会触发 app/__init__.py 的导入链，代理启动才是毫秒级的
@@ -258,7 +256,7 @@ class FileSystemProxy:
"""
if self._timeout_override is not None:
return self._timeout_override
return float(getattr(settings, "FS_PROXY_TIMEOUT", DEFAULT_TIMEOUT))
return float(get_runtime_setting("FS_PROXY_TIMEOUT", DEFAULT_TIMEOUT))
@property
def _stall_timeout(self) -> float:
@@ -267,14 +265,16 @@ class FileSystemProxy:
"""
if self._stall_timeout_override is not None:
return self._stall_timeout_override
return float(getattr(settings, "FS_PROXY_STALL_TIMEOUT", DEFAULT_STALL_TIMEOUT))
return float(
get_runtime_setting("FS_PROXY_STALL_TIMEOUT", DEFAULT_STALL_TIMEOUT)
)
@staticmethod
def _enabled() -> bool:
"""
代理是否启用。关闭时退回直接调用，行为与引入代理之前完全一致。
"""
return bool(getattr(settings, "FS_PROXY_ENABLED", True))
return bool(get_runtime_setting("FS_PROXY_ENABLED", True))
@staticmethod
def _direct(op: str, payload: Dict[str, Any]) -> Any:
app/adapters/system/plugin/dependency.py
+1 -1
View File
@@ -52,7 +52,7 @@ class PluginDependencyInstaller:
self._helper = helper
self._installed_plugins_provider = installed_plugins_provider or (lambda: [])
self._plugin_dir = plugin_dir or (
Path(get_runtime_setting("ROOT_PATH")) / "app" / "plugins"
Path(get_runtime_setting('ROOT_PATH')) / "app" / "plugins"
)
@staticmethod
app/adapters/system/plugin/package.py
+11 -10
View File
@@ -16,10 +16,7 @@ from app.runtime.execution import (
run_in_threadpool_to_completion as _await_thread_operation,
)
from app.runtime.log import logger
from app.runtime.settings import RuntimeSettingsCompat
# 保留旧模块级入口，插件本地同步测试和旧扩展仍可能覆盖这些设置。
settings = RuntimeSettingsCompat()
from app.runtime.settings import get_runtime_setting
@dataclass(frozen=True, slots=True)
class PluginPackageCheckpoint:
@@ -58,7 +55,7 @@ class PluginPackageManager:
def __plugin_dir(plugin_id: str) -> Path:
"""解析插件运行目录并拒绝越出宿主插件根目录的标识。"""
plugins_root = (
Path(settings.ROOT_PATH) / "app" / "plugins"
Path(get_runtime_setting('ROOT_PATH')) / "app" / "plugins"
).resolve()
plugin_dir = (plugins_root / plugin_id.lower()).resolve()
if plugin_dir == plugins_root or not plugin_dir.is_relative_to(plugins_root):
@@ -74,7 +71,9 @@ class PluginPackageManager:
plugin_dir = self.__plugin_dir(plugin_id)
durable = transaction_id is not None
persistent_backup_dir = (
Path(settings.CONFIG_PATH) / "plugins_backup" / plugin_id.lower()
Path(get_runtime_setting('CONFIG_PATH'))
/ "plugins_backup"
/ plugin_id.lower()
).resolve()
backup_staging_dir = (
persistent_backup_dir.parent
@@ -89,9 +88,9 @@ class PluginPackageManager:
else None
)
transaction_root = (
Path(settings.CONFIG_PATH)
Path(get_runtime_setting('CONFIG_PATH'))
if durable
else Path(settings.TEMP_PATH)
else Path(get_runtime_setting('TEMP_PATH'))
)
transaction_dir = (
transaction_root
@@ -129,7 +128,9 @@ class PluginPackageManager:
"""按受控根目录和事务 ID 重建崩溃回放所需的文件引用。"""
plugin_dir = self.__plugin_dir(plugin_id)
persistent_backup_dir = (
Path(settings.CONFIG_PATH) / "plugins_backup" / plugin_id.lower()
Path(get_runtime_setting('CONFIG_PATH'))
/ "plugins_backup"
/ plugin_id.lower()
).resolve()
durable_backup = SystemUtils.is_docker()
return PluginPackageCheckpoint(
@@ -149,7 +150,7 @@ class PluginPackageManager:
else None
),
transaction_dir=(
Path(settings.CONFIG_PATH)
Path(get_runtime_setting('CONFIG_PATH'))
/ "plugin_transactions"
/ transaction_id
),
app/adapters/system/resource.py
+11 -17
View File
@@ -5,18 +5,12 @@ import sysconfig
from pathlib import Path
from typing import Callable
from app.runtime import config as _runtime_config
from app.runtime.log import logger
from app.adapters.network.http import RequestUtils
from app.foundation.version import compare_version
from app.adapters.system.host import SystemUtils
from app.foundation.version import compare_version
from app.runtime.log import logger
from app.runtime.settings import get_runtime_setting
# 保留模块级旧 Settings 入口，旧插件和测试可能仍会对其做运行时覆盖；实现读取统一走 runtime 端口。
settings = _runtime_config.settings
ResourceVersionProvider = Callable[[], tuple[str, str]]
@@ -39,9 +33,9 @@ class ResourceHelper:
检测和更新资源包
"""
_base_dir: Path = get_runtime_setting("ROOT_PATH")
_base_dir: Path = get_runtime_setting('ROOT_PATH')
_resource_target = Path("app/application/site")
_version_flag = get_runtime_setting("RESOURCE_VERSION_FLAG")
_version_flag = get_runtime_setting('RESOURCE_VERSION_FLAG')
_repo = (
f"{get_runtime_setting('GITHUB_PROXY')}https://raw.githubusercontent.com/"
f"jxxghp/MoviePilot-Resources/main/package.{_version_flag}.json"
@@ -56,8 +50,8 @@ class ResourceHelper:
"""返回访问 GitHub 资源时应使用的代理配置。"""
return (
None
if get_runtime_setting("GITHUB_PROXY")
else get_runtime_setting("PROXY")
if get_runtime_setting('GITHUB_PROXY')
else get_runtime_setting('PROXY')
)
@staticmethod
@@ -97,7 +91,7 @@ class ResourceHelper:
"""读取 V3 资源清单。"""
response = RequestUtils(
proxies=self.proxies,
headers=get_runtime_setting("GITHUB_HEADERS"),
headers=get_runtime_setting('GITHUB_HEADERS'),
timeout=10,
).get_res(self._repo)
return response if response and response.status_code == 200 else None
@@ -115,7 +109,7 @@ class ResourceHelper:
:param indexer_version: 当前已加载的站点索引资源版本；省略时使用组合根注入值
:return: 是否成功安装了需要由上层处理重启的新资源
"""
if not get_runtime_setting("AUTO_UPDATE_RESOURCE"):
if not get_runtime_setting('AUTO_UPDATE_RESOURCE'):
return False
if SystemUtils.is_frozen():
return False
@@ -170,8 +164,8 @@ class ResourceHelper:
if need_updates:
# 下载文件信息列表
r = RequestUtils(
proxies=get_runtime_setting("PROXY"),
headers=get_runtime_setting("GITHUB_HEADERS"),
proxies=get_runtime_setting('PROXY'),
headers=get_runtime_setting('GITHUB_HEADERS'),
timeout=30,
).get_res(self._files_api)
if r and not r.ok:
@@ -201,7 +195,7 @@ class ResourceHelper:
)
res = RequestUtils(
proxies=self.proxies,
headers=get_runtime_setting("GITHUB_HEADERS"),
headers=get_runtime_setting('GITHUB_HEADERS'),
timeout=180,
).get_res(download_url)
if not res:
app/adapters/system/rust.py
+1 -1
View File
@@ -17,7 +17,7 @@ else:
def _rust_accel_enabled() -> bool:
"""读取 Rust 开关快照，组合根未装配时回退旧 Settings。"""
return bool(get_runtime_setting("RUST_ACCEL"))
return bool(get_runtime_setting('RUST_ACCEL'))
def is_required() -> bool:
app/adapters/system/update.py
+4 -4
View File
@@ -43,7 +43,7 @@ class SystemUpdateManager(metaclass=SingletonClass):
@property
def _root(self) -> Path:
return Path(get_runtime_setting("TEMP_PATH")) / "moviepilot-update"
return Path(get_runtime_setting('TEMP_PATH')) / "moviepilot-update"
@property
def _state_file(self) -> Path:
@@ -268,8 +268,8 @@ class SystemUpdateManager(metaclass=SingletonClass):
def _request(self) -> RequestUtils:
return RequestUtils(
proxies=get_runtime_setting("PROXY"),
headers=get_runtime_setting("GITHUB_HEADERS"),
proxies=get_runtime_setting('PROXY'),
headers=get_runtime_setting('GITHUB_HEADERS'),
timeout=60,
)
@@ -474,7 +474,7 @@ class SystemUpdateManager(metaclass=SingletonClass):
@staticmethod
def _proxied(url: str) -> str:
proxy = str(get_runtime_setting("GITHUB_PROXY") or "").strip()
proxy = str(get_runtime_setting('GITHUB_PROXY') or "").strip()
return f"{proxy}{url}" if proxy else url