From f74f936d72e83e843ecf26bbef691449a70cbc62 Mon Sep 17 00:00:00 2001 From: duffyduck Date: Fri, 6 Mar 2026 08:40:53 +0100 Subject: [PATCH] remove lexoffice name in project --- app/database.py | 2 +- app/mail_processor.py | 20 ++++++++++---------- app/main.py | 10 +++++----- app/scanner.py | 14 +++++++------- app/smb_processor.py | 10 +++++----- app/templates/base.html | 4 ++-- app/templates/scan.html | 4 ++-- app/templates/settings.html | 12 ++++++------ docker-compose.yml | 2 +- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/database.py b/app/database.py index 49d16d3..af24978 100644 --- a/app/database.py +++ b/app/database.py @@ -19,7 +19,7 @@ DEFAULT_SETTINGS = { "smtp_ssl": "starttls", "smtp_username": "", "smtp_password": "", - "lexoffice_email": "", + "import_email": "", "source_folder": "Rechnungen", "processed_folder": "Rechnungen/Verarbeitet", "interval_minutes": "5", diff --git a/app/mail_processor.py b/app/mail_processor.py index 8d85860..af89dd2 100644 --- a/app/mail_processor.py +++ b/app/mail_processor.py @@ -85,7 +85,7 @@ def _build_forward_email( msg["Subject"] = f"Belegimport: {original_subject}" body = ( - f"Automatisch weitergeleitet von LexOffice Belegimport.\n" + f"Automatisch weitergeleitet von Belegimport.\n" f"Original-Absender: {original_from}\n" f"Original-Betreff: {original_subject}\n" f"Anzahl Anhänge: {len(attachments)}" @@ -121,13 +121,13 @@ def _move_email(conn: imaplib.IMAP4, msg_uid: bytes, dest_folder: str): async def process_mailbox() -> dict: settings = await get_settings() - if not settings.get("imap_server") or not settings.get("lexoffice_email"): - logger.warning("IMAP oder LexOffice-Email nicht konfiguriert") + if not settings.get("imap_server") or not settings.get("import_email"): + logger.warning("IMAP oder Import-Email nicht konfiguriert") return {"processed": 0, "skipped": 0, "errors": 0, "error": "Nicht konfiguriert"} source_folder = settings.get("source_folder", "INBOX") processed_folder = settings.get("processed_folder", "INBOX/Verarbeitet") - lexoffice_email = settings["lexoffice_email"] + import_email = settings["import_email"] smtp_from = settings.get("smtp_username", "") processed = 0 @@ -187,7 +187,7 @@ async def process_mailbox() -> dict: forward_msg = _build_forward_email( from_addr=smtp_from, - to_addr=lexoffice_email, + to_addr=import_email, original_subject=subject, original_from=from_addr, attachments=attachments, @@ -259,18 +259,18 @@ async def process_mailbox() -> dict: async def send_test_email() -> dict: settings = await get_settings() - if not settings.get("smtp_server") or not settings.get("lexoffice_email"): - return {"success": False, "error": "SMTP oder LexOffice-Email nicht konfiguriert"} + if not settings.get("smtp_server") or not settings.get("import_email"): + return {"success": False, "error": "SMTP oder Import-Email nicht konfiguriert"} try: smtp_conn = _connect_smtp(settings) msg = MIMEMultipart() msg["From"] = settings["smtp_username"] - msg["To"] = settings["lexoffice_email"] - msg["Subject"] = "LexOffice Belegimport - Test-Email" + msg["To"] = settings["import_email"] + msg["Subject"] = "Belegimport - Test-Email" msg.attach(MIMEText( - "Dies ist eine Test-Email vom LexOffice Belegimport Service.\n" + "Dies ist eine Test-Email vom Belegimport Service.\n" "Wenn Sie diese Email erhalten, funktioniert die SMTP-Verbindung.", "plain", "utf-8", diff --git a/app/main.py b/app/main.py index 733b4e7..f714aca 100644 --- a/app/main.py +++ b/app/main.py @@ -32,12 +32,12 @@ async def lifespan(app: FastAPI): interval = int(settings.get("interval_minutes", 5)) enabled = settings.get("scheduler_enabled", "false") == "true" configure_job(interval, enabled) - logger.info("LexOffice Belegimport gestartet") + logger.info("Belegimport gestartet") yield - logger.info("LexOffice Belegimport beendet") + logger.info("Belegimport beendet") -app = FastAPI(title="LexOffice Belegimport", lifespan=lifespan) +app = FastAPI(title="Belegimport", lifespan=lifespan) app.mount("/static", StaticFiles(directory="app/static"), name="static") templates = Jinja2Templates(directory="app/templates") @@ -73,7 +73,7 @@ async def _save_form_settings(request: Request) -> dict: "smtp_ssl": form.get("smtp_ssl", "starttls"), "smtp_username": form.get("smtp_username", ""), "smtp_password": form.get("smtp_password") or current.get("smtp_password", ""), - "lexoffice_email": form.get("lexoffice_email", ""), + "import_email": form.get("import_email", ""), "source_folder": form.get("source_folder", "Rechnungen"), "processed_folder": form.get("processed_folder", "Rechnungen/Verarbeitet"), "interval_minutes": form.get("interval_minutes", "5"), @@ -323,5 +323,5 @@ async def separator_pdf(): return Response( content=pdf_bytes, media_type="application/pdf", - headers={"Content-Disposition": "attachment; filename=Trennseite_LexOffice.pdf"}, + headers={"Content-Disposition": "attachment; filename=Trennseite.pdf"}, ) diff --git a/app/scanner.py b/app/scanner.py index db7413e..b12de99 100644 --- a/app/scanner.py +++ b/app/scanner.py @@ -16,7 +16,7 @@ from app.mail_processor import _connect_smtp, _build_forward_email logger = logging.getLogger(__name__) -SEPARATOR_QR_CONTENT = "LEXOFFICE-TRENNUNG" +SEPARATOR_QR_CONTENT = "BELEGIMPORT-TRENNUNG" UPLOAD_DIR = Path(os.environ.get("UPLOAD_DIR", "/data/uploads")) @@ -85,11 +85,11 @@ def split_pdf(pdf_path: str, separator_pages: list[int]) -> list[bytes]: async def process_scanned_pdf(pdf_path: str, progress_callback=None) -> dict: - """Full pipeline: detect separators, split, send each document to LexOffice.""" + """Full pipeline: detect separators, split, send each document via email.""" settings = await get_settings() - if not settings.get("smtp_server") or not settings.get("lexoffice_email"): - return {"error": "SMTP oder LexOffice-Email nicht konfiguriert", "total_pages": 0, "documents": 0, "sent": 0, "errors": 1} + if not settings.get("smtp_server") or not settings.get("import_email"): + return {"error": "SMTP oder Import-Email nicht konfiguriert", "total_pages": 0, "documents": 0, "sent": 0, "errors": 1} # Step 1: Detect separator pages (CPU-bound, run in thread) if progress_callback: @@ -116,7 +116,7 @@ async def process_scanned_pdf(pdf_path: str, progress_callback=None) -> dict: if not documents: return {"error": "Keine Dokumente nach dem Splitting gefunden", "total_pages": total_pages, "documents": 0, "sent": 0, "errors": 1} - # Step 3: Send each document to LexOffice + # Step 3: Send each document via email if progress_callback: progress_callback("status", 0, 0, f"{len(documents)} Dokument(e) erkannt, starte Versand...") @@ -135,7 +135,7 @@ async def process_scanned_pdf(pdf_path: str, progress_callback=None) -> dict: filename = f"Scan_Dokument_{i + 1}.pdf" msg = _build_forward_email( from_addr=settings["smtp_username"], - to_addr=settings["lexoffice_email"], + to_addr=settings["import_email"], original_subject=f"Scan-Upload Dokument {i + 1}/{len(documents)}", original_from="Scan-Upload", attachments=[(filename, doc_bytes)], @@ -217,7 +217,7 @@ def generate_separator_pdf() -> bytes: # Title text _centered_textbox(page, 120, "TRENNSEITE", 36, (0, 0, 0)) - _centered_textbox(page, 170, "LexOffice Belegimport", 16, (0.4, 0.4, 0.4)) + _centered_textbox(page, 170, "Belegimport", 16, (0.4, 0.4, 0.4)) # Insert QR code image centered qr_bytes = io.BytesIO() diff --git a/app/smb_processor.py b/app/smb_processor.py index c60eff1..9d21048 100644 --- a/app/smb_processor.py +++ b/app/smb_processor.py @@ -124,12 +124,12 @@ async def process_smb_share() -> dict: if not settings.get("smb_server") or not settings.get("smb_share"): return {"processed": 0, "skipped": 0, "errors": 0, "error": "SMB nicht konfiguriert"} - if not settings.get("lexoffice_email"): - return {"processed": 0, "skipped": 0, "errors": 0, "error": "LexOffice-Email nicht konfiguriert"} + if not settings.get("import_email"): + return {"processed": 0, "skipped": 0, "errors": 0, "error": "Import-Email nicht konfiguriert"} mode = settings.get("smb_mode", "forward") smtp_from = settings.get("smtp_username", "") - lexoffice_email = settings["lexoffice_email"] + import_email = settings["import_email"] processed = 0 skipped = 0 @@ -180,7 +180,7 @@ async def process_smb_share() -> dict: subject = f"SMB-Import: {filename} (Dokument {i + 1}/{len(documents)})" msg = _build_forward_email( from_addr=smtp_from, - to_addr=lexoffice_email, + to_addr=import_email, original_subject=subject, original_from="SMB-Import", attachments=[(doc_filename, doc_bytes)], @@ -200,7 +200,7 @@ async def process_smb_share() -> dict: else: msg = _build_forward_email( from_addr=smtp_from, - to_addr=lexoffice_email, + to_addr=import_email, original_subject=f"SMB-Import: {filename}", original_from="SMB-Import", attachments=[(filename, pdf_data)], diff --git a/app/templates/base.html b/app/templates/base.html index ffa3618..103d448 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -3,12 +3,12 @@ - LexOffice Belegimport + Belegimport