mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-17 02:05:22 -04:00
refactor(constants): single source of truth for data dir (#3368)
* refactor(constants): single source of truth for data dir + merge core/src constants Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs(contributing): use named src.constants for data paths, drop core/constants references Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -31,7 +31,8 @@ sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||
|
||||
server = Server("email")
|
||||
EMAIL_SOCKET_TIMEOUT = float(os.environ.get("EMAIL_SOCKET_TIMEOUT", "20"))
|
||||
DATA_DIR = Path(__file__).resolve().parent.parent / "data"
|
||||
from src.constants import DATA_DIR as _DATA_DIR, APP_DB, EMAIL_CACHE_DB, SETTINGS_FILE as _SETTINGS_FILE, MAIL_ATTACHMENTS_DIR
|
||||
DATA_DIR = Path(_DATA_DIR)
|
||||
|
||||
|
||||
def _b(value) -> bytes:
|
||||
@@ -63,7 +64,7 @@ def _clean_header_value(value) -> str:
|
||||
|
||||
|
||||
def _db_path() -> Path:
|
||||
return DATA_DIR / "app.db"
|
||||
return Path(APP_DB)
|
||||
|
||||
|
||||
def _list_accounts_raw() -> list:
|
||||
@@ -162,7 +163,7 @@ def _load_config(account: str | None = None) -> dict:
|
||||
"trash_folder": os.environ.get("TRASH_FOLDER", "Trash"),
|
||||
"cache_db": os.environ.get(
|
||||
"EMAIL_CACHE_DB",
|
||||
str(DATA_DIR / "email_cache.db"),
|
||||
EMAIL_CACHE_DB,
|
||||
),
|
||||
"account_id": None,
|
||||
"account_name": None,
|
||||
@@ -204,7 +205,7 @@ def _load_config(account: str | None = None) -> dict:
|
||||
else:
|
||||
# Legacy fallback: settings.json flat keys
|
||||
try:
|
||||
settings_path = Path(__file__).resolve().parent.parent / "data" / "settings.json"
|
||||
settings_path = Path(_SETTINGS_FILE)
|
||||
if settings_path.exists():
|
||||
settings = json.loads(settings_path.read_text(encoding="utf-8"))
|
||||
for key in (
|
||||
@@ -1061,7 +1062,7 @@ def _download_attachment(uid, index, folder="INBOX", account=None):
|
||||
raw = msg_data[0][1]
|
||||
msg = email.message_from_bytes(raw)
|
||||
|
||||
target_dir = DATA_DIR / "mail-attachments" / f"{folder}_{uid}"
|
||||
target_dir = Path(MAIL_ATTACHMENTS_DIR) / f"{folder}_{uid}"
|
||||
filepath = _extract_attachment_to_disk(msg, index, target_dir)
|
||||
if not filepath:
|
||||
return {"error": f"Attachment index {index} not found"}
|
||||
|
||||
@@ -16,6 +16,8 @@ from mcp.types import Tool, TextContent
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||
|
||||
from src.constants import GENERATED_IMAGES_DIR
|
||||
|
||||
server = Server("image_gen")
|
||||
|
||||
|
||||
@@ -121,7 +123,7 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
|
||||
_pub_base = (get_setting("app_public_url", "") or "").rstrip("/")
|
||||
|
||||
if img.get("b64_json"):
|
||||
img_dir = Path("data/generated_images")
|
||||
img_dir = Path(GENERATED_IMAGES_DIR)
|
||||
img_dir.mkdir(parents=True, exist_ok=True)
|
||||
filename = f"{uuid.uuid4().hex[:12]}.png"
|
||||
img_path = img_dir / filename
|
||||
|
||||
Reference in New Issue
Block a user