fix(emails): robuste Header-Dekodierung (unknown-8bit killt Scan nicht mehr)
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
6968d3bf12
commit
bd2e21ea9c
1 changed files with 15 additions and 13 deletions
|
|
@ -13,7 +13,7 @@ from datetime import datetime
|
||||||
from typing import List, Optional, Dict, Any
|
from typing import List, Optional, Dict, Any
|
||||||
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
|
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
|
||||||
from sqlalchemy.orm import Session
|
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.database import get_db, SessionLocal
|
||||||
from backend.models import EmailLog, Invoice
|
from backend.models import EmailLog, Invoice
|
||||||
|
|
@ -21,6 +21,16 @@ from backend.routers.settings import get_imap_config
|
||||||
|
|
||||||
router = APIRouter()
|
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
|
# ponytail: in-memory scan state, fine for single process
|
||||||
_scan_tasks: dict = {}
|
_scan_tasks: dict = {}
|
||||||
_active_scan_id: Optional[str] = None
|
_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", "")
|
from_addr = msg.get("From", "")
|
||||||
|
|
||||||
# Subject decodieren
|
# Subject decodieren
|
||||||
decoded_subject, encoding = decode_header(subject)[0]
|
subject = decode_hdr(subject)
|
||||||
if isinstance(decoded_subject, bytes):
|
|
||||||
subject = decoded_subject.decode(encoding or "utf-8")
|
|
||||||
|
|
||||||
# Prüfen auf Keywords
|
# Prüfen auf Keywords
|
||||||
subject_lower = subject.lower()
|
subject_lower = subject.lower()
|
||||||
|
|
@ -97,9 +105,7 @@ def extract_attachments(msg: email.message.Message) -> List[Dict[str, Any]]:
|
||||||
|
|
||||||
filename = part.get_filename()
|
filename = part.get_filename()
|
||||||
if filename:
|
if filename:
|
||||||
decoded_filename, encoding = decode_header(filename)[0]
|
filename = decode_hdr(filename)
|
||||||
if isinstance(decoded_filename, bytes):
|
|
||||||
filename = decoded_filename.decode(encoding or "utf-8")
|
|
||||||
|
|
||||||
content_type = part.get_content_type()
|
content_type = part.get_content_type()
|
||||||
payload = part.get_payload(decode=True)
|
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:
|
if not filename:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
decoded_filename, encoding = decode_header(filename)[0]
|
filename = decode_hdr(filename)
|
||||||
if isinstance(decoded_filename, bytes):
|
|
||||||
filename = decoded_filename.decode(encoding or "utf-8")
|
|
||||||
|
|
||||||
content_type = part.get_content_type()
|
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", "")
|
from_addr = msg.get("From", "")
|
||||||
date_str = msg.get("Date", "")
|
date_str = msg.get("Date", "")
|
||||||
email_date = parse_email_date(date_str)
|
email_date = parse_email_date(date_str)
|
||||||
decoded_subject, enc = decode_header(subject)[0]
|
subject = decode_hdr(subject)
|
||||||
if isinstance(decoded_subject, bytes):
|
|
||||||
subject = decoded_subject.decode(enc or "utf-8")
|
|
||||||
subject_lower = subject.lower()
|
subject_lower = subject.lower()
|
||||||
matched_keywords = [kw for kw in INVOICE_KEYWORDS if kw in subject_lower]
|
matched_keywords = [kw for kw in INVOICE_KEYWORDS if kw in subject_lower]
|
||||||
log_entry = None
|
log_entry = None
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue