04/24 Fixed email settings aren't shared accross the devices
This commit is contained in:
+4
-4
@@ -42,7 +42,7 @@ _stop_event = threading.Event()
|
|||||||
def load_email_config() -> dict:
|
def load_email_config() -> dict:
|
||||||
"""Load email settings from app_settings table."""
|
"""Load email settings from app_settings table."""
|
||||||
from config import get_settings_dict
|
from config import get_settings_dict
|
||||||
from utils.config_crypto import decrypt_value
|
from utils.crypto import decrypt
|
||||||
s = get_settings_dict("email.")
|
s = get_settings_dict("email.")
|
||||||
security = s.get("email.security", "")
|
security = s.get("email.security", "")
|
||||||
if not security:
|
if not security:
|
||||||
@@ -54,7 +54,7 @@ def load_email_config() -> dict:
|
|||||||
"smtp_host": s.get("email.smtp_host", ""),
|
"smtp_host": s.get("email.smtp_host", ""),
|
||||||
"smtp_port": int(s.get("email.smtp_port", "587") or "587"),
|
"smtp_port": int(s.get("email.smtp_port", "587") or "587"),
|
||||||
"smtp_user": s.get("email.smtp_user", ""),
|
"smtp_user": s.get("email.smtp_user", ""),
|
||||||
"smtp_password": decrypt_value(s.get("email.smtp_password", "")),
|
"smtp_password": decrypt(s.get("email.smtp_password", "")),
|
||||||
"security": security,
|
"security": security,
|
||||||
"use_tls": security == "starttls",
|
"use_tls": security == "starttls",
|
||||||
"recipients": [r.strip() for r in
|
"recipients": [r.strip() for r in
|
||||||
@@ -68,7 +68,7 @@ def save_email_config(enabled: bool, smtp_host: str, smtp_port: int,
|
|||||||
recipients: str, send_time: str):
|
recipients: str, send_time: str):
|
||||||
"""Persist email settings to app_settings table."""
|
"""Persist email settings to app_settings table."""
|
||||||
from config import get_setting, set_setting
|
from config import get_setting, set_setting
|
||||||
from utils.config_crypto import encrypt_value
|
from utils.crypto import encrypt
|
||||||
# Preserve last_sent_date — do not overwrite it on a normal save
|
# Preserve last_sent_date — do not overwrite it on a normal save
|
||||||
last_sent = get_setting("email.last_sent_date", "")
|
last_sent = get_setting("email.last_sent_date", "")
|
||||||
pairs = {
|
pairs = {
|
||||||
@@ -76,7 +76,7 @@ def save_email_config(enabled: bool, smtp_host: str, smtp_port: int,
|
|||||||
"email.smtp_host": smtp_host,
|
"email.smtp_host": smtp_host,
|
||||||
"email.smtp_port": str(smtp_port),
|
"email.smtp_port": str(smtp_port),
|
||||||
"email.smtp_user": smtp_user,
|
"email.smtp_user": smtp_user,
|
||||||
"email.smtp_password": encrypt_value(smtp_password),
|
"email.smtp_password": encrypt(smtp_password),
|
||||||
"email.security": security,
|
"email.security": security,
|
||||||
"email.use_tls": str(security == "starttls").lower(),
|
"email.use_tls": str(security == "starttls").lower(),
|
||||||
"email.recipients": recipients,
|
"email.recipients": recipients,
|
||||||
|
|||||||
@@ -168,10 +168,10 @@ class AiSummaryView(ttk.Frame):
|
|||||||
def _load_config(self):
|
def _load_config(self):
|
||||||
try:
|
try:
|
||||||
from config import get_setting
|
from config import get_setting
|
||||||
from utils.config_crypto import decrypt_value
|
from utils.crypto import decrypt
|
||||||
raw_key = get_setting("groq.api_key", "")
|
raw_key = get_setting("groq.api_key", "")
|
||||||
if raw_key:
|
if raw_key:
|
||||||
self._api_key_var.set(decrypt_value(raw_key))
|
self._api_key_var.set(decrypt(raw_key))
|
||||||
model = get_setting("groq.model", GROQ_MODELS[0])
|
model = get_setting("groq.model", GROQ_MODELS[0])
|
||||||
if model in GROQ_MODELS:
|
if model in GROQ_MODELS:
|
||||||
self._model_var.set(model)
|
self._model_var.set(model)
|
||||||
@@ -181,8 +181,8 @@ class AiSummaryView(ttk.Frame):
|
|||||||
def _save_config(self):
|
def _save_config(self):
|
||||||
try:
|
try:
|
||||||
from config import set_setting
|
from config import set_setting
|
||||||
from utils.config_crypto import encrypt_value
|
from utils.crypto import encrypt
|
||||||
set_setting("groq.api_key", encrypt_value(self._api_key_var.get().strip()))
|
set_setting("groq.api_key", encrypt(self._api_key_var.get().strip()))
|
||||||
set_setting("groq.model", self._model_var.get())
|
set_setting("groq.model", self._model_var.get())
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"Could not save Groq config: {e}")
|
logger.warning(f"Could not save Groq config: {e}")
|
||||||
|
|||||||
Reference in New Issue
Block a user