From 43c7a3cace3414405981024a49ac61a9f5d357c8 Mon Sep 17 00:00:00 2001 From: kislovdm Date: Thu, 9 Apr 2026 13:16:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=97=D0=BC=D0=B5=D0=BD=D1=8F=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.sample | 3 ++- README.md | 2 +- src/config.py | 9 +++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.env.sample b/.env.sample index 7853129..575d24d 100644 --- a/.env.sample +++ b/.env.sample @@ -4,4 +4,5 @@ MAX_PHONE=+10000000000 MAX_WORK_DIR=cache TELEGRAM_BOT_TOKEN=123456789:your_bot_token TELEGRAM_FALLBACK_USER_ID=123456789 -SQLITE_PATH=max2telegram.db +## SQLite база (по умолчанию используется cache/max2telegram.db) +SQLITE_PATH=cache/max2telegram.db diff --git a/README.md b/README.md index ca72743..ca3374b 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ - `MAX_WORK_DIR` - директория сессии Max (обычно `cache`); - `TELEGRAM_BOT_TOKEN` - токен Telegram-бота; - `TELEGRAM_FALLBACK_USER_ID` - id пользователя Telegram для fallback отправки; -- `SQLITE_PATH` - путь к SQLite базе (например `max2telegram.db`). +- `SQLITE_PATH` - путь к SQLite базе (рекомендуется `cache/max2telegram.db`, по умолчанию так и будет). Дополнительно: diff --git a/src/config.py b/src/config.py index 9cda0bd..1b87435 100644 --- a/src/config.py +++ b/src/config.py @@ -19,10 +19,15 @@ def _require_env(name: str) -> str: def load_settings() -> Settings: + max_work_dir = os.getenv("MAX_WORK_DIR", "cache").strip() or "cache" + sqlite_env = os.getenv("SQLITE_PATH", "").strip() + sqlite_default = os.path.join(max_work_dir, "max2telegram.db") + sqlite_path = sqlite_env or sqlite_default + return Settings( max_phone=_require_env("MAX_PHONE"), - max_work_dir=os.getenv("MAX_WORK_DIR", "cache").strip() or "cache", + max_work_dir=max_work_dir, telegram_bot_token=_require_env("TELEGRAM_BOT_TOKEN"), telegram_fallback_user_id=_require_env("TELEGRAM_FALLBACK_USER_ID"), - sqlite_path=os.getenv("SQLITE_PATH", "max2telegram.db").strip() or "max2telegram.db", + sqlite_path=sqlite_path, )