diff --git a/backend/routers/emails.py b/backend/routers/emails.py index e132c1b..3d3afb1 100644 --- a/backend/routers/emails.py +++ b/backend/routers/emails.py @@ -13,7 +13,7 @@ from datetime import datetime from typing import List, Optional, Dict, Any from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException from sqlalchemy.orm import Session -from email.header import decode_header +from email.header import decode_header, make_header from backend.database import get_db, SessionLocal from backend.models import EmailLog, Invoice @@ -21,6 +21,16 @@ from backend.routers.settings import get_imap_config router = APIRouter() + +def decode_hdr(value) -> str: + """Header robust dekodieren (alle Segmente); kaputte Encodings (unknown-8bit) -> replace statt Abbruch.""" + if not value: + return "" + try: + return str(make_header(decode_header(str(value)))) + except Exception: + return str(value) + # ponytail: in-memory scan state, fine for single process _scan_tasks: dict = {} _active_scan_id: Optional[str] = None @@ -74,9 +84,7 @@ def search_invoices(mail: imaplib.IMAP4_SSL, folder: str = "INBOX") -> List[str] from_addr = msg.get("From", "") # Subject decodieren - decoded_subject, encoding = decode_header(subject)[0] - if isinstance(decoded_subject, bytes): - subject = decoded_subject.decode(encoding or "utf-8") + subject = decode_hdr(subject) # Prüfen auf Keywords subject_lower = subject.lower() @@ -97,9 +105,7 @@ def extract_attachments(msg: email.message.Message) -> List[Dict[str, Any]]: filename = part.get_filename() if filename: - decoded_filename, encoding = decode_header(filename)[0] - if isinstance(decoded_filename, bytes): - filename = decoded_filename.decode(encoding or "utf-8") + filename = decode_hdr(filename) content_type = part.get_content_type() payload = part.get_payload(decode=True) @@ -200,9 +206,7 @@ def extract_and_process_attachments(msg: email.message.Message, email_id: str, d if not filename: continue - decoded_filename, encoding = decode_header(filename)[0] - if isinstance(decoded_filename, bytes): - filename = decoded_filename.decode(encoding or "utf-8") + filename = decode_hdr(filename) content_type = part.get_content_type() @@ -322,9 +326,7 @@ def _scan_imap(mail_conn, db: Session, state: dict, since_date: Optional[str] = from_addr = msg.get("From", "") date_str = msg.get("Date", "") email_date = parse_email_date(date_str) - decoded_subject, enc = decode_header(subject)[0] - if isinstance(decoded_subject, bytes): - subject = decoded_subject.decode(enc or "utf-8") + subject = decode_hdr(subject) subject_lower = subject.lower() matched_keywords = [kw for kw in INVOICE_KEYWORDS if kw in subject_lower] log_entry = None