Relocate Python EA helpers under MQL5

python_for_ea/src/ea_py/paths.py

@@ -3,19 +3,24 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+import os
 from pathlib import Path
 
 
 DEFAULT_USER_NAME = "new"
 DEFAULT_TERMINAL_ID = "5BDB0B60344C088C2FA5CA35699BAAFD"
+ENV_MT5_FILES_DIR = "MT5_FILES_DIR"
+ENV_MT5_DATA_PATH = "MT5_DATA_PATH"
 
 
 @dataclass(frozen=True)
 class Mt5PathSettings:
     """MT5データフォルダを特定するための設定。"""
 
-    user_name: str = DEFAULT_USER_NAME
-    terminal_id: str = DEFAULT_TERMINAL_ID
+    files_dir: Path | None = None
+    data_path: Path | None = None
+    user_name: str | None = None
+    terminal_id: str | None = None
 
 
 @dataclass(frozen=True)
@@ -43,17 +48,76 @@ class EntryPaths:
     debug_reason: Path
 
 
+def discover_mql5_dir(start_path: Path | None = None) -> Path | None:
+    """このPythonプロジェクトの配置からMQL5ルートを探す。"""
+    path = (start_path or Path(__file__)).resolve()
+    candidates = [path, *path.parents]
+    for candidate in candidates:
+        if candidate.name.lower() == "mql5":
+            return candidate
+
+    return None
+
+
+def files_dir_from_data_path(data_path: Path) -> Path:
+    """MT5データフォルダまたはMQL5フォルダからFilesパスを作る。"""
+    resolved = data_path.resolve()
+    if resolved.name.lower() == "mql5":
+        return resolved / "Files"
+
+    return resolved / "MQL5" / "Files"
+
+
 def terminal_files_dir(settings: Mt5PathSettings | None = None) -> Path:
-    """MT5のMQL5/Filesディレクトリを返す。"""
+    """MT5のMQL5/Filesディレクトリを返す。
+
+    既定では `MQL5/python_for_ea` 配置から親の `MQL5/Files` を発見する。
+    テストや特殊運用では `MT5_FILES_DIR` または `MT5_DATA_PATH` で上書きできる。
+    """
+    if settings and settings.files_dir is not None:
+        return settings.files_dir
+
+    env_files_dir = os.getenv(ENV_MT5_FILES_DIR)
+    if env_files_dir:
+        return Path(env_files_dir)
+
+    if settings and settings.data_path is not None:
+        return files_dir_from_data_path(settings.data_path)
+
+    env_data_path = os.getenv(ENV_MT5_DATA_PATH)
+    if env_data_path:
+        return files_dir_from_data_path(Path(env_data_path))
+
     mt5_settings = settings or Mt5PathSettings()
+    if mt5_settings.user_name is not None or mt5_settings.terminal_id is not None:
+        user_name = mt5_settings.user_name or DEFAULT_USER_NAME
+        terminal_id = mt5_settings.terminal_id or DEFAULT_TERMINAL_ID
+        return (
+            Path("C:/Users")
+            / user_name
+            / "AppData"
+            / "Roaming"
+            / "MetaQuotes"
+            / "Terminal"
+            / terminal_id
+            / "MQL5"
+            / "Files"
+        )
+
+    discovered_mql5_dir = discover_mql5_dir()
+    if discovered_mql5_dir is not None:
+        return discovered_mql5_dir / "Files"
+
+    user_name = mt5_settings.user_name or DEFAULT_USER_NAME
+    terminal_id = mt5_settings.terminal_id or DEFAULT_TERMINAL_ID
     return (
         Path("C:/Users")
-        / mt5_settings.user_name
+        / user_name
         / "AppData"
         / "Roaming"
         / "MetaQuotes"
         / "Terminal"
-        / mt5_settings.terminal_id
+        / terminal_id
         / "MQL5"
         / "Files"
     )