Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a23a3968ef | |||
| 9cdc9ae443 |
@@ -1,5 +1,32 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.3.0] - 2026-04-09
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Neue Config-Sektion `[output]` mit:
|
||||||
|
- `name_mode` — Platzierung des Tags im Dateinamen: `"prefix"`, `"suffix"` (vor Extension), `"none"`
|
||||||
|
- `name_tag` — verbatim einzufügender String, z.B. `"OCR_"` oder `"_OCR"`
|
||||||
|
- `original_on_success` — `"delete"` (alter Default) oder `"archive"`
|
||||||
|
- `archive_dir` — Zielverzeichnis für `"archive"`, mit Kollisions-Schutz (Timestamp-Suffix)
|
||||||
|
- Runtime-Validierung der Output-Config in `check_output_config()`
|
||||||
|
- 20 neue Tests für `build_output_name()`, `check_output_config()` und `process_pdf()`
|
||||||
|
mit allen Kombinationen aus Modus + Original-Behandlung
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- `process_pdf()` nimmt jetzt `output_cfg: OutputConfig` als Pflicht-Argument
|
||||||
|
|
||||||
|
## [0.2.2] - 2026-04-09
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **Issue #3**: Ghostscript 10.0.0–10.02.0 (Debian 12 default) zerschießen OCR mit PDF/A + `skip_text=true`.
|
||||||
|
- `config.example.toml`: `pdfa_level = ""` als sicherer Default
|
||||||
|
- Runtime-Preflight: Prüft `gs --version` wenn `pdfa_level` gesetzt ist, bricht mit klarer Fehlermeldung ab
|
||||||
|
- `install.sh`: warnt bei betroffenen GS-Versionen mit Upgrade-Hinweis auf bookworm-backports
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- `is_ghostscript_broken()` / `detect_ghostscript_version()` in `pdf_ocr_hotfolder.service`
|
||||||
|
- 19 weitere pytest-Tests für GS-Versions-Detection (parametrisiert) und Preflight-Kombinationen
|
||||||
|
|
||||||
## [0.2.1] - 2026-04-09
|
## [0.2.1] - 2026-04-09
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
@@ -89,6 +89,22 @@ max_workers = 2 # parallele PDFs
|
|||||||
timeout = 1800
|
timeout = 1800
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### `[output]`
|
||||||
|
```toml
|
||||||
|
# Dateiname im outgoing/:
|
||||||
|
# "prefix" → OCR_scan.pdf
|
||||||
|
# "suffix" → scan_OCR.pdf (vor der Extension)
|
||||||
|
# "none" → scan.pdf (unverändert)
|
||||||
|
name_mode = "prefix"
|
||||||
|
name_tag = "OCR_"
|
||||||
|
|
||||||
|
# Nach erfolgreichem OCR mit dem Original:
|
||||||
|
# "delete" → löschen
|
||||||
|
# "archive" → in archive_dir verschieben
|
||||||
|
original_on_success = "delete"
|
||||||
|
archive_dir = "" # absoluter Pfad, Pflicht bei "archive"
|
||||||
|
```
|
||||||
|
|
||||||
### `[upload.nextcloud]`
|
### `[upload.nextcloud]`
|
||||||
```toml
|
```toml
|
||||||
enabled = true
|
enabled = true
|
||||||
|
|||||||
+20
-1
@@ -21,7 +21,10 @@ skip_text = true
|
|||||||
# Auflösung für gerasterte Seiten
|
# Auflösung für gerasterte Seiten
|
||||||
oversample = 300
|
oversample = 300
|
||||||
# PDF/A-Konformitätsstufe ("1", "2", "3" oder leer für keinen PDF/A-Output)
|
# PDF/A-Konformitätsstufe ("1", "2", "3" oder leer für keinen PDF/A-Output)
|
||||||
pdfa_level = "2"
|
# ACHTUNG: Ghostscript 10.0.0 bis 10.02.0 (Debian 12 default!) haben einen Bug,
|
||||||
|
# der mit pdfa_level + skip_text=true ocrmypdf komplett blockiert.
|
||||||
|
# Sicherer Default ist "" — nur auf "1"/"2"/"3" setzen, wenn gs >= 10.02.1 installiert ist.
|
||||||
|
pdfa_level = ""
|
||||||
# Schiefe Scans automatisch begradigen
|
# Schiefe Scans automatisch begradigen
|
||||||
deskew = true
|
deskew = true
|
||||||
# Hintergrund säubern
|
# Hintergrund säubern
|
||||||
@@ -31,6 +34,22 @@ max_workers = 2
|
|||||||
# Timeout pro PDF in Sekunden
|
# Timeout pro PDF in Sekunden
|
||||||
timeout = 1800
|
timeout = 1800
|
||||||
|
|
||||||
|
[output]
|
||||||
|
# Wie soll die Ziel-Datei im outgoing/-Ordner benannt werden?
|
||||||
|
# "prefix" : name_tag wird vor den Dateinamen gestellt (OCR_scan.pdf)
|
||||||
|
# "suffix" : name_tag wird vor die Extension gestellt (scan_OCR.pdf)
|
||||||
|
# "none" : Dateiname bleibt wie das Original
|
||||||
|
name_mode = "prefix"
|
||||||
|
# Verbatim einzufügender String. Leerer String = kein Tag (wie mode="none").
|
||||||
|
# Beispiele: "OCR_", "[OCR]_", "_OCR", "_searchable"
|
||||||
|
name_tag = "OCR_"
|
||||||
|
# Was passiert mit dem Original, wenn OCR erfolgreich war?
|
||||||
|
# "delete" : Original wird gelöscht (alter Standard)
|
||||||
|
# "archive" : Original wird in archive_dir verschoben
|
||||||
|
original_on_success = "delete"
|
||||||
|
# Absoluter Pfad; nur relevant wenn original_on_success = "archive"
|
||||||
|
archive_dir = ""
|
||||||
|
|
||||||
[verapdf]
|
[verapdf]
|
||||||
# PDF/A-Validierung (optional)
|
# PDF/A-Validierung (optional)
|
||||||
enabled = false
|
enabled = false
|
||||||
|
|||||||
+20
@@ -52,6 +52,26 @@ install_base() {
|
|||||||
icc-profiles-free ca-certificates curl
|
icc-profiles-free ca-certificates curl
|
||||||
log_info "System-Pakete ok ✓"
|
log_info "System-Pakete ok ✓"
|
||||||
|
|
||||||
|
# Ghostscript-Versions-Check (Issue #3)
|
||||||
|
if command -v gs >/dev/null 2>&1; then
|
||||||
|
GS_VER="$(gs --version 2>/dev/null || echo 0.0)"
|
||||||
|
log_info "Ghostscript: $GS_VER"
|
||||||
|
case "$GS_VER" in
|
||||||
|
10.0.0|10.00.0|10.01.*|10.02.0)
|
||||||
|
echo
|
||||||
|
log_warn "═══════════════════════════════════════════════════════════════"
|
||||||
|
log_warn "Ghostscript $GS_VER ist vom PDF/A-Bug betroffen (10.0.0–10.02.0)."
|
||||||
|
log_warn "Mit pdfa_level + skip_text=true kann ocrmypdf KEINE PDFs verarbeiten."
|
||||||
|
log_warn ""
|
||||||
|
log_warn "Workarounds:"
|
||||||
|
log_warn " 1. ghostscript aus bookworm-backports installieren (>=10.02.1)"
|
||||||
|
log_warn " 2. In der Config [ocr].pdfa_level = \"\" setzen (Default ab v0.2.2)"
|
||||||
|
log_warn "═══════════════════════════════════════════════════════════════"
|
||||||
|
echo
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
log_step "Default-User '$DEFAULT_USER' prüfen"
|
log_step "Default-User '$DEFAULT_USER' prüfen"
|
||||||
if id "$DEFAULT_USER" &>/dev/null; then
|
if id "$DEFAULT_USER" &>/dev/null; then
|
||||||
log_info "'$DEFAULT_USER' existiert bereits"
|
log_info "'$DEFAULT_USER' existiert bereits"
|
||||||
|
|||||||
@@ -28,6 +28,18 @@ class OcrConfig:
|
|||||||
timeout: int = 1800
|
timeout: int = 1800
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class OutputConfig:
|
||||||
|
# "prefix" | "suffix" | "none"
|
||||||
|
name_mode: str = "prefix"
|
||||||
|
# Tag-String, verbatim eingefügt (Leerstring = kein Tag)
|
||||||
|
name_tag: str = "OCR_"
|
||||||
|
# "delete" | "archive"
|
||||||
|
original_on_success: str = "delete"
|
||||||
|
# Absoluter Pfad; Pflicht wenn original_on_success == "archive"
|
||||||
|
archive_dir: str = ""
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class VeraPdfConfig:
|
class VeraPdfConfig:
|
||||||
enabled: bool = False
|
enabled: bool = False
|
||||||
@@ -79,6 +91,7 @@ class EmailNotify:
|
|||||||
class Config:
|
class Config:
|
||||||
paths: Paths
|
paths: Paths
|
||||||
ocr: OcrConfig
|
ocr: OcrConfig
|
||||||
|
output: OutputConfig
|
||||||
verapdf: VeraPdfConfig
|
verapdf: VeraPdfConfig
|
||||||
folder: FolderUpload
|
folder: FolderUpload
|
||||||
nextcloud: NextcloudUpload
|
nextcloud: NextcloudUpload
|
||||||
@@ -109,6 +122,8 @@ def load_config(path: str | Path) -> Config:
|
|||||||
|
|
||||||
ocr = OcrConfig(**{k: v for k, v in _section(data, "ocr").items()
|
ocr = OcrConfig(**{k: v for k, v in _section(data, "ocr").items()
|
||||||
if k in OcrConfig.__annotations__})
|
if k in OcrConfig.__annotations__})
|
||||||
|
output = OutputConfig(**{k: v for k, v in _section(data, "output").items()
|
||||||
|
if k in OutputConfig.__annotations__})
|
||||||
verapdf = VeraPdfConfig(**{k: v for k, v in _section(data, "verapdf").items()
|
verapdf = VeraPdfConfig(**{k: v for k, v in _section(data, "verapdf").items()
|
||||||
if k in VeraPdfConfig.__annotations__})
|
if k in VeraPdfConfig.__annotations__})
|
||||||
folder = FolderUpload(**{k: v for k, v in _section(data, "upload", "folder").items()
|
folder = FolderUpload(**{k: v for k, v in _section(data, "upload", "folder").items()
|
||||||
@@ -123,7 +138,7 @@ def load_config(path: str | Path) -> Config:
|
|||||||
log_level = _section(data, "logging").get("level", "INFO")
|
log_level = _section(data, "logging").get("level", "INFO")
|
||||||
|
|
||||||
return Config(
|
return Config(
|
||||||
paths=paths, ocr=ocr, verapdf=verapdf,
|
paths=paths, ocr=ocr, output=output, verapdf=verapdf,
|
||||||
folder=folder, nextcloud=nextcloud, sftp=sftp, email=email,
|
folder=folder, nextcloud=nextcloud, sftp=sftp, email=email,
|
||||||
log_level=log_level,
|
log_level=log_level,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -7,11 +7,37 @@ import subprocess
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from .config import OcrConfig, VeraPdfConfig
|
from .config import OcrConfig, OutputConfig, VeraPdfConfig
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def build_output_name(src_name: str, mode: str, tag: str) -> str:
|
||||||
|
"""Erzeugt den Ziel-Dateinamen für ein OCR-PDF.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
src_name: Original-Dateiname (z.B. "scan.pdf")
|
||||||
|
mode: "prefix" | "suffix" | "none"
|
||||||
|
tag: Einzufügender String (verbatim, leer = kein Tag)
|
||||||
|
|
||||||
|
Beispiele:
|
||||||
|
prefix "OCR_": "scan.pdf" -> "OCR_scan.pdf"
|
||||||
|
suffix "_OCR": "scan.pdf" -> "scan_OCR.pdf"
|
||||||
|
suffix "_OCR": "scan.tar.gz.pdf" -> "scan.tar.gz_OCR.pdf"
|
||||||
|
none: "scan.pdf" -> "scan.pdf"
|
||||||
|
"""
|
||||||
|
if mode == "none" or not tag:
|
||||||
|
return src_name
|
||||||
|
if mode == "prefix":
|
||||||
|
return f"{tag}{src_name}"
|
||||||
|
if mode == "suffix":
|
||||||
|
# Nur die letzte Extension abspalten, sonst "foo.bar.pdf" kaputt gemacht
|
||||||
|
p = Path(src_name)
|
||||||
|
stem, ext = p.stem, p.suffix
|
||||||
|
return f"{stem}{tag}{ext}"
|
||||||
|
raise ValueError(f"Unbekannter name_mode: {mode!r}")
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class ProcessResult:
|
class ProcessResult:
|
||||||
source: Path
|
source: Path
|
||||||
@@ -71,11 +97,13 @@ def process_pdf(
|
|||||||
error_dir: Path,
|
error_dir: Path,
|
||||||
ocr_cfg: OcrConfig,
|
ocr_cfg: OcrConfig,
|
||||||
vera_cfg: VeraPdfConfig,
|
vera_cfg: VeraPdfConfig,
|
||||||
|
output_cfg: OutputConfig,
|
||||||
) -> ProcessResult:
|
) -> ProcessResult:
|
||||||
"""Verarbeitet eine einzelne PDF: move→OCR→validate→outgoing/error."""
|
"""Verarbeitet eine einzelne PDF: move→OCR→validate→outgoing/error."""
|
||||||
|
out_name = build_output_name(src.name, output_cfg.name_mode, output_cfg.name_tag)
|
||||||
work_src = working_dir / src.name
|
work_src = working_dir / src.name
|
||||||
work_out = working_dir / f"OCR_{src.name}"
|
work_out = working_dir / f"__ocr_{out_name}" # Temp-Name, damit er != src.name ist
|
||||||
final_out = outgoing_dir / f"OCR_{src.name}"
|
final_out = outgoing_dir / out_name
|
||||||
|
|
||||||
try:
|
try:
|
||||||
shutil.move(str(src), str(work_src))
|
shutil.move(str(src), str(work_src))
|
||||||
@@ -100,10 +128,38 @@ def process_pdf(
|
|||||||
|
|
||||||
outgoing_dir.mkdir(parents=True, exist_ok=True)
|
outgoing_dir.mkdir(parents=True, exist_ok=True)
|
||||||
shutil.move(str(work_out), str(final_out))
|
shutil.move(str(work_out), str(final_out))
|
||||||
work_src.unlink(missing_ok=True)
|
_dispose_original(work_src, src.name, output_cfg)
|
||||||
return ProcessResult(src, final_out, True, verapdf_passed=vera_ok)
|
return ProcessResult(src, final_out, True, verapdf_passed=vera_ok)
|
||||||
|
|
||||||
|
|
||||||
|
def _dispose_original(work_src: Path, original_name: str, cfg: OutputConfig) -> None:
|
||||||
|
"""Entsorgt das Original nach erfolgreichem OCR — löschen oder archivieren."""
|
||||||
|
if not work_src.exists():
|
||||||
|
return
|
||||||
|
mode = cfg.original_on_success
|
||||||
|
if mode == "delete":
|
||||||
|
work_src.unlink(missing_ok=True)
|
||||||
|
return
|
||||||
|
if mode == "archive":
|
||||||
|
if not cfg.archive_dir:
|
||||||
|
log.error("original_on_success=archive aber archive_dir ist leer — lösche stattdessen")
|
||||||
|
work_src.unlink(missing_ok=True)
|
||||||
|
return
|
||||||
|
archive = Path(cfg.archive_dir)
|
||||||
|
archive.mkdir(parents=True, exist_ok=True)
|
||||||
|
dest = archive / original_name
|
||||||
|
# Bei Namens-Kollision mit Timestamp umbenennen
|
||||||
|
if dest.exists():
|
||||||
|
from datetime import datetime
|
||||||
|
ts = datetime.now().strftime("%Y%m%d-%H%M%S")
|
||||||
|
dest = archive / f"{dest.stem}_{ts}{dest.suffix}"
|
||||||
|
shutil.move(str(work_src), str(dest))
|
||||||
|
log.info("Original archiviert: %s", dest)
|
||||||
|
return
|
||||||
|
log.warning("Unbekannter original_on_success=%r — lösche stattdessen", mode)
|
||||||
|
work_src.unlink(missing_ok=True)
|
||||||
|
|
||||||
|
|
||||||
def _move_to_error(p: Path, error_dir: Path) -> None:
|
def _move_to_error(p: Path, error_dir: Path) -> None:
|
||||||
error_dir.mkdir(parents=True, exist_ok=True)
|
error_dir.mkdir(parents=True, exist_ok=True)
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -2,8 +2,10 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
import re
|
||||||
import shutil
|
import shutil
|
||||||
import signal
|
import signal
|
||||||
|
import subprocess
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
from concurrent.futures import Future, ThreadPoolExecutor
|
from concurrent.futures import Future, ThreadPoolExecutor
|
||||||
@@ -26,11 +28,72 @@ class PreflightError(RuntimeError):
|
|||||||
# Pflicht-Binaries für ocrmypdf
|
# Pflicht-Binaries für ocrmypdf
|
||||||
_REQUIRED_BINARIES = ("tesseract", "gs")
|
_REQUIRED_BINARIES = ("tesseract", "gs")
|
||||||
|
|
||||||
|
# Ghostscript-Versionen mit bekanntem PDF/A+skip_text Bug (Issue #3):
|
||||||
|
# 10.0.0 .. 10.02.0 (inklusive). Ab 10.02.1 wieder nutzbar.
|
||||||
|
_GS_BROKEN_MIN = (10, 0, 0)
|
||||||
|
_GS_BROKEN_MAX = (10, 2, 0)
|
||||||
|
|
||||||
def check_preflight() -> None:
|
|
||||||
"""Prüft, ob alle externen Abhängigkeiten (Tesseract, Ghostscript) installiert sind.
|
|
||||||
|
|
||||||
Wirft PreflightError mit Liste der fehlenden Binaries.
|
def _parse_version(text: str) -> tuple[int, ...] | None:
|
||||||
|
"""Extrahiert die erste X.Y[.Z] Version aus einem String."""
|
||||||
|
m = re.search(r"(\d+)\.(\d+)(?:\.(\d+))?", text)
|
||||||
|
if not m:
|
||||||
|
return None
|
||||||
|
return tuple(int(x) if x is not None else 0 for x in m.groups())
|
||||||
|
|
||||||
|
|
||||||
|
def is_ghostscript_broken(version: str | None) -> bool:
|
||||||
|
"""Prüft, ob eine Ghostscript-Version vom PDF/A+skip_text Bug betroffen ist.
|
||||||
|
|
||||||
|
Betrifft 10.0.0 bis einschließlich 10.02.0. Ab 10.02.1 wieder sicher.
|
||||||
|
"""
|
||||||
|
if not version:
|
||||||
|
return False
|
||||||
|
parsed = _parse_version(version)
|
||||||
|
if parsed is None:
|
||||||
|
return False
|
||||||
|
# Auf 3-Tupel normalisieren
|
||||||
|
while len(parsed) < 3:
|
||||||
|
parsed = parsed + (0,)
|
||||||
|
parsed = parsed[:3]
|
||||||
|
return _GS_BROKEN_MIN <= parsed <= _GS_BROKEN_MAX
|
||||||
|
|
||||||
|
|
||||||
|
def detect_ghostscript_version() -> str | None:
|
||||||
|
"""Ruft `gs --version` auf und gibt den Versionsstring zurück (oder None)."""
|
||||||
|
gs = shutil.which("gs")
|
||||||
|
if gs is None:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
result = subprocess.run([gs, "--version"], capture_output=True,
|
||||||
|
text=True, timeout=5)
|
||||||
|
except (OSError, subprocess.TimeoutExpired):
|
||||||
|
return None
|
||||||
|
return result.stdout.strip() or None
|
||||||
|
|
||||||
|
|
||||||
|
def check_output_config(mode: str, archive_dir: str) -> None:
|
||||||
|
"""Validiert die [output]-Section. Wirft PreflightError bei Problemen."""
|
||||||
|
valid_modes = {"delete", "archive"}
|
||||||
|
if mode not in valid_modes:
|
||||||
|
raise PreflightError(
|
||||||
|
f"[output].original_on_success={mode!r} ungültig. "
|
||||||
|
f"Erlaubt: {sorted(valid_modes)}"
|
||||||
|
)
|
||||||
|
if mode == "archive" and not archive_dir:
|
||||||
|
raise PreflightError(
|
||||||
|
"[output].original_on_success='archive' erfordert [output].archive_dir"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def check_preflight(pdfa_level: str = "") -> None:
|
||||||
|
"""Prüft externe Abhängigkeiten.
|
||||||
|
|
||||||
|
- Tesseract und Ghostscript müssen im PATH sein
|
||||||
|
- Bei gesetztem pdfa_level wird die Ghostscript-Version gegen den
|
||||||
|
bekannten 10.0.0–10.02.0 Bug geprüft
|
||||||
|
|
||||||
|
Wirft PreflightError bei fehlenden Binaries oder unsicherem Ghostscript.
|
||||||
"""
|
"""
|
||||||
missing = [b for b in _REQUIRED_BINARIES if shutil.which(b) is None]
|
missing = [b for b in _REQUIRED_BINARIES if shutil.which(b) is None]
|
||||||
if missing:
|
if missing:
|
||||||
@@ -39,6 +102,16 @@ def check_preflight() -> None:
|
|||||||
+ ". Bitte installieren: sudo apt install tesseract-ocr ghostscript"
|
+ ". Bitte installieren: sudo apt install tesseract-ocr ghostscript"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if pdfa_level:
|
||||||
|
gs_version = detect_ghostscript_version()
|
||||||
|
if is_ghostscript_broken(gs_version):
|
||||||
|
raise PreflightError(
|
||||||
|
f"Ghostscript {gs_version} ist mit pdfa_level='{pdfa_level}' nicht "
|
||||||
|
"kompatibel (bekannter Bug in 10.0.0–10.02.0). "
|
||||||
|
"Entweder ghostscript auf >=10.02.1 upgraden (z.B. via bookworm-backports) "
|
||||||
|
"oder in der Config [ocr].pdfa_level = \"\" setzen."
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _is_pdf(path: Path) -> bool:
|
def _is_pdf(path: Path) -> bool:
|
||||||
return path.suffix.lower() == ".pdf" and path.is_file()
|
return path.suffix.lower() == ".pdf" and path.is_file()
|
||||||
@@ -113,7 +186,9 @@ class HotfolderService:
|
|||||||
# ---- Lifecycle ----
|
# ---- Lifecycle ----
|
||||||
|
|
||||||
def run(self) -> None:
|
def run(self) -> None:
|
||||||
check_preflight()
|
check_preflight(self.cfg.ocr.pdfa_level)
|
||||||
|
check_output_config(self.cfg.output.original_on_success,
|
||||||
|
self.cfg.output.archive_dir)
|
||||||
self.ensure_dirs()
|
self.ensure_dirs()
|
||||||
self._scan_existing()
|
self._scan_existing()
|
||||||
|
|
||||||
@@ -137,7 +212,9 @@ class HotfolderService:
|
|||||||
Returns:
|
Returns:
|
||||||
Anzahl fehlgeschlagener PDFs (0 = alles ok).
|
Anzahl fehlgeschlagener PDFs (0 = alles ok).
|
||||||
"""
|
"""
|
||||||
check_preflight()
|
check_preflight(self.cfg.ocr.pdfa_level)
|
||||||
|
check_output_config(self.cfg.output.original_on_success,
|
||||||
|
self.cfg.output.archive_dir)
|
||||||
self.ensure_dirs()
|
self.ensure_dirs()
|
||||||
self._scan_existing()
|
self._scan_existing()
|
||||||
self._executor.shutdown(wait=True)
|
self._executor.shutdown(wait=True)
|
||||||
@@ -195,6 +272,7 @@ class HotfolderService:
|
|||||||
error_dir=self.cfg.paths.error,
|
error_dir=self.cfg.paths.error,
|
||||||
ocr_cfg=self.cfg.ocr,
|
ocr_cfg=self.cfg.ocr,
|
||||||
vera_cfg=self.cfg.verapdf,
|
vera_cfg=self.cfg.verapdf,
|
||||||
|
output_cfg=self.cfg.output,
|
||||||
)
|
)
|
||||||
|
|
||||||
with self._lock:
|
with self._lock:
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ from pdf_ocr_hotfolder.config import (
|
|||||||
FolderUpload,
|
FolderUpload,
|
||||||
NextcloudUpload,
|
NextcloudUpload,
|
||||||
OcrConfig,
|
OcrConfig,
|
||||||
|
OutputConfig,
|
||||||
Paths,
|
Paths,
|
||||||
SftpUpload,
|
SftpUpload,
|
||||||
VeraPdfConfig,
|
VeraPdfConfig,
|
||||||
@@ -32,6 +33,7 @@ def tmp_config(tmp_path: Path) -> Config:
|
|||||||
return Config(
|
return Config(
|
||||||
paths=paths,
|
paths=paths,
|
||||||
ocr=OcrConfig(max_workers=1),
|
ocr=OcrConfig(max_workers=1),
|
||||||
|
output=OutputConfig(),
|
||||||
verapdf=VeraPdfConfig(enabled=False),
|
verapdf=VeraPdfConfig(enabled=False),
|
||||||
folder=FolderUpload(enabled=False),
|
folder=FolderUpload(enabled=False),
|
||||||
nextcloud=NextcloudUpload(enabled=False),
|
nextcloud=NextcloudUpload(enabled=False),
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
"""Tests für Issue #3: Ghostscript 10.0.0–10.02.0 PDF/A-Bug-Erkennung."""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from pdf_ocr_hotfolder.service import (
|
||||||
|
PreflightError,
|
||||||
|
check_preflight,
|
||||||
|
is_ghostscript_broken,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("version,expected", [
|
||||||
|
# Betroffene Versionen
|
||||||
|
("10.0.0", True),
|
||||||
|
("10.00.0", True),
|
||||||
|
("10.01.0", True),
|
||||||
|
("10.01.1", True),
|
||||||
|
("10.01.2", True),
|
||||||
|
("10.02.0", True),
|
||||||
|
# Sichere Versionen
|
||||||
|
("10.02.1", False),
|
||||||
|
("10.03.0", False),
|
||||||
|
("10.04.0", False),
|
||||||
|
("11.0.0", False),
|
||||||
|
("9.56.1", False), # Debian 11 / Ubuntu 22.04
|
||||||
|
("9.55.0", False),
|
||||||
|
# Edge cases
|
||||||
|
("", False),
|
||||||
|
(None, False),
|
||||||
|
("garbage", False),
|
||||||
|
])
|
||||||
|
def test_is_ghostscript_broken(version, expected) -> None:
|
||||||
|
assert is_ghostscript_broken(version) is expected
|
||||||
|
|
||||||
|
|
||||||
|
def test_check_preflight_without_pdfa_passes_with_broken_gs() -> None:
|
||||||
|
"""Ohne pdfa_level darf der betroffene GS verwendet werden."""
|
||||||
|
with patch("pdf_ocr_hotfolder.service.shutil.which", return_value="/usr/bin/fake"), \
|
||||||
|
patch("pdf_ocr_hotfolder.service.detect_ghostscript_version",
|
||||||
|
return_value="10.0.0"):
|
||||||
|
check_preflight(pdfa_level="") # darf nicht werfen
|
||||||
|
|
||||||
|
|
||||||
|
def test_check_preflight_with_pdfa_fails_on_broken_gs() -> None:
|
||||||
|
"""Mit pdfa_level + kaputtem GS → PreflightError mit hilfreicher Meldung."""
|
||||||
|
with patch("pdf_ocr_hotfolder.service.shutil.which", return_value="/usr/bin/fake"), \
|
||||||
|
patch("pdf_ocr_hotfolder.service.detect_ghostscript_version",
|
||||||
|
return_value="10.0.0"):
|
||||||
|
with pytest.raises(PreflightError, match="Ghostscript 10.0.0"):
|
||||||
|
check_preflight(pdfa_level="2")
|
||||||
|
|
||||||
|
|
||||||
|
def test_check_preflight_with_pdfa_passes_on_fixed_gs() -> None:
|
||||||
|
"""Mit pdfa_level + gefixtem GS → ok."""
|
||||||
|
with patch("pdf_ocr_hotfolder.service.shutil.which", return_value="/usr/bin/fake"), \
|
||||||
|
patch("pdf_ocr_hotfolder.service.detect_ghostscript_version",
|
||||||
|
return_value="10.02.1"):
|
||||||
|
check_preflight(pdfa_level="2") # darf nicht werfen
|
||||||
|
|
||||||
|
|
||||||
|
def test_default_config_pdfa_level_is_empty() -> None:
|
||||||
|
"""Default-Config der Beispiel-Datei soll pdfa_level='' enthalten (Issue #3)."""
|
||||||
|
from pathlib import Path
|
||||||
|
import tomllib
|
||||||
|
cfg_path = Path(__file__).parent.parent / "config.example.toml"
|
||||||
|
with cfg_path.open("rb") as f:
|
||||||
|
data = tomllib.load(f)
|
||||||
|
assert data["ocr"]["pdfa_level"] == "", \
|
||||||
|
"config.example.toml muss pdfa_level='' als sicheren Default haben"
|
||||||
@@ -8,7 +8,7 @@ from pdf_ocr_hotfolder.processor import ProcessResult
|
|||||||
from pdf_ocr_hotfolder.service import HotfolderService
|
from pdf_ocr_hotfolder.service import HotfolderService
|
||||||
|
|
||||||
|
|
||||||
def _fake_success(src: Path, working_dir, outgoing_dir, error_dir, ocr_cfg, vera_cfg):
|
def _fake_success(src: Path, working_dir, outgoing_dir, error_dir, **kwargs):
|
||||||
out = outgoing_dir / f"OCR_{src.name}"
|
out = outgoing_dir / f"OCR_{src.name}"
|
||||||
out.parent.mkdir(parents=True, exist_ok=True)
|
out.parent.mkdir(parents=True, exist_ok=True)
|
||||||
out.write_bytes(b"%PDF-1.4 ocr\n")
|
out.write_bytes(b"%PDF-1.4 ocr\n")
|
||||||
@@ -16,7 +16,7 @@ def _fake_success(src: Path, working_dir, outgoing_dir, error_dir, ocr_cfg, vera
|
|||||||
return ProcessResult(src, out, True)
|
return ProcessResult(src, out, True)
|
||||||
|
|
||||||
|
|
||||||
def _fake_failure(src: Path, working_dir, outgoing_dir, error_dir, ocr_cfg, vera_cfg):
|
def _fake_failure(src: Path, working_dir, outgoing_dir, error_dir, **kwargs):
|
||||||
error_dir.mkdir(parents=True, exist_ok=True)
|
error_dir.mkdir(parents=True, exist_ok=True)
|
||||||
dest = error_dir / src.name
|
dest = error_dir / src.name
|
||||||
src.rename(dest)
|
src.rename(dest)
|
||||||
|
|||||||
@@ -0,0 +1,190 @@
|
|||||||
|
"""Tests für Feature: konfigurierbare Dateinamen und Original-Behandlung."""
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from pdf_ocr_hotfolder.config import OcrConfig, OutputConfig, VeraPdfConfig
|
||||||
|
from pdf_ocr_hotfolder.processor import build_output_name, process_pdf
|
||||||
|
from pdf_ocr_hotfolder.service import PreflightError, check_output_config
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------- build_output_name ----------------
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("src,mode,tag,expected", [
|
||||||
|
# prefix
|
||||||
|
("scan.pdf", "prefix", "OCR_", "OCR_scan.pdf"),
|
||||||
|
("scan.pdf", "prefix", "[OCR] ", "[OCR] scan.pdf"),
|
||||||
|
# suffix (Tag vor Extension)
|
||||||
|
("scan.pdf", "suffix", "_OCR", "scan_OCR.pdf"),
|
||||||
|
("scan.pdf", "suffix", "-ocr", "scan-ocr.pdf"),
|
||||||
|
# none
|
||||||
|
("scan.pdf", "none", "OCR_", "scan.pdf"),
|
||||||
|
# leerer Tag = none
|
||||||
|
("scan.pdf", "prefix", "", "scan.pdf"),
|
||||||
|
("scan.pdf", "suffix", "", "scan.pdf"),
|
||||||
|
# Mehrfach-Punkte im Namen: nur letzte Extension zählt
|
||||||
|
("rechnung.2026.pdf", "suffix", "_OCR", "rechnung.2026_OCR.pdf"),
|
||||||
|
("rechnung.2026.pdf", "prefix", "OCR_", "OCR_rechnung.2026.pdf"),
|
||||||
|
# Name ohne Extension
|
||||||
|
("NO_EXT", "suffix", "_OCR", "NO_EXT_OCR"),
|
||||||
|
])
|
||||||
|
def test_build_output_name(src, mode, tag, expected) -> None:
|
||||||
|
assert build_output_name(src, mode, tag) == expected
|
||||||
|
|
||||||
|
|
||||||
|
def test_build_output_name_invalid_mode() -> None:
|
||||||
|
with pytest.raises(ValueError, match="name_mode"):
|
||||||
|
build_output_name("x.pdf", "bogus", "OCR_")
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------- check_output_config ----------------
|
||||||
|
|
||||||
|
def test_check_output_config_delete_ok() -> None:
|
||||||
|
check_output_config("delete", "") # ok
|
||||||
|
|
||||||
|
|
||||||
|
def test_check_output_config_archive_requires_dir() -> None:
|
||||||
|
with pytest.raises(PreflightError, match="archive_dir"):
|
||||||
|
check_output_config("archive", "")
|
||||||
|
|
||||||
|
|
||||||
|
def test_check_output_config_archive_with_dir_ok() -> None:
|
||||||
|
check_output_config("archive", "/var/archive") # ok
|
||||||
|
|
||||||
|
|
||||||
|
def test_check_output_config_invalid_mode() -> None:
|
||||||
|
with pytest.raises(PreflightError, match="ungültig"):
|
||||||
|
check_output_config("trash", "")
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------- process_pdf mit Original-Behandlung ----------------
|
||||||
|
|
||||||
|
def _fake_ocr(src: Path, dst: Path, cfg: OcrConfig) -> None:
|
||||||
|
"""Simuliert ocrmypdf: kopiert Inhalt, erzeugt Zieldatei."""
|
||||||
|
dst.write_bytes(b"%PDF-1.4 OCRed\n" + src.read_bytes())
|
||||||
|
|
||||||
|
|
||||||
|
def _prepare(tmp_path: Path) -> dict:
|
||||||
|
dirs = {
|
||||||
|
"working": tmp_path / "working",
|
||||||
|
"outgoing": tmp_path / "outgoing",
|
||||||
|
"error": tmp_path / "error",
|
||||||
|
"archive": tmp_path / "archive",
|
||||||
|
"incoming": tmp_path / "incoming",
|
||||||
|
}
|
||||||
|
for d in dirs.values():
|
||||||
|
d.mkdir(parents=True, exist_ok=True)
|
||||||
|
src = dirs["incoming"] / "scan.pdf"
|
||||||
|
src.write_bytes(b"%PDF-1.4 original\n")
|
||||||
|
return {"src": src, **dirs}
|
||||||
|
|
||||||
|
|
||||||
|
def test_process_pdf_prefix_delete(tmp_path: Path) -> None:
|
||||||
|
env = _prepare(tmp_path)
|
||||||
|
out_cfg = OutputConfig(name_mode="prefix", name_tag="OCR_",
|
||||||
|
original_on_success="delete")
|
||||||
|
with patch("pdf_ocr_hotfolder.processor.run_ocr", side_effect=_fake_ocr):
|
||||||
|
result = process_pdf(
|
||||||
|
src=env["src"],
|
||||||
|
working_dir=env["working"],
|
||||||
|
outgoing_dir=env["outgoing"],
|
||||||
|
error_dir=env["error"],
|
||||||
|
ocr_cfg=OcrConfig(),
|
||||||
|
vera_cfg=VeraPdfConfig(enabled=False),
|
||||||
|
output_cfg=out_cfg,
|
||||||
|
)
|
||||||
|
assert result.success
|
||||||
|
assert (env["outgoing"] / "OCR_scan.pdf").exists()
|
||||||
|
# Original ist weg, weder in incoming noch in working
|
||||||
|
assert not env["src"].exists()
|
||||||
|
assert not (env["working"] / "scan.pdf").exists()
|
||||||
|
|
||||||
|
|
||||||
|
def test_process_pdf_suffix_delete(tmp_path: Path) -> None:
|
||||||
|
env = _prepare(tmp_path)
|
||||||
|
out_cfg = OutputConfig(name_mode="suffix", name_tag="_OCR",
|
||||||
|
original_on_success="delete")
|
||||||
|
with patch("pdf_ocr_hotfolder.processor.run_ocr", side_effect=_fake_ocr):
|
||||||
|
result = process_pdf(
|
||||||
|
src=env["src"],
|
||||||
|
working_dir=env["working"],
|
||||||
|
outgoing_dir=env["outgoing"],
|
||||||
|
error_dir=env["error"],
|
||||||
|
ocr_cfg=OcrConfig(),
|
||||||
|
vera_cfg=VeraPdfConfig(enabled=False),
|
||||||
|
output_cfg=out_cfg,
|
||||||
|
)
|
||||||
|
assert result.success
|
||||||
|
assert (env["outgoing"] / "scan_OCR.pdf").exists()
|
||||||
|
|
||||||
|
|
||||||
|
def test_process_pdf_none_mode(tmp_path: Path) -> None:
|
||||||
|
env = _prepare(tmp_path)
|
||||||
|
out_cfg = OutputConfig(name_mode="none", name_tag="OCR_",
|
||||||
|
original_on_success="delete")
|
||||||
|
with patch("pdf_ocr_hotfolder.processor.run_ocr", side_effect=_fake_ocr):
|
||||||
|
result = process_pdf(
|
||||||
|
src=env["src"],
|
||||||
|
working_dir=env["working"],
|
||||||
|
outgoing_dir=env["outgoing"],
|
||||||
|
error_dir=env["error"],
|
||||||
|
ocr_cfg=OcrConfig(),
|
||||||
|
vera_cfg=VeraPdfConfig(enabled=False),
|
||||||
|
output_cfg=out_cfg,
|
||||||
|
)
|
||||||
|
assert result.success
|
||||||
|
# Ausgang hat GLEICHEN Namen wie Original
|
||||||
|
assert (env["outgoing"] / "scan.pdf").exists()
|
||||||
|
|
||||||
|
|
||||||
|
def test_process_pdf_archive_original(tmp_path: Path) -> None:
|
||||||
|
env = _prepare(tmp_path)
|
||||||
|
out_cfg = OutputConfig(name_mode="prefix", name_tag="OCR_",
|
||||||
|
original_on_success="archive",
|
||||||
|
archive_dir=str(env["archive"]))
|
||||||
|
with patch("pdf_ocr_hotfolder.processor.run_ocr", side_effect=_fake_ocr):
|
||||||
|
result = process_pdf(
|
||||||
|
src=env["src"],
|
||||||
|
working_dir=env["working"],
|
||||||
|
outgoing_dir=env["outgoing"],
|
||||||
|
error_dir=env["error"],
|
||||||
|
ocr_cfg=OcrConfig(),
|
||||||
|
vera_cfg=VeraPdfConfig(enabled=False),
|
||||||
|
output_cfg=out_cfg,
|
||||||
|
)
|
||||||
|
assert result.success
|
||||||
|
assert (env["outgoing"] / "OCR_scan.pdf").exists()
|
||||||
|
# Original liegt jetzt im Archiv
|
||||||
|
archived = env["archive"] / "scan.pdf"
|
||||||
|
assert archived.exists()
|
||||||
|
assert archived.read_bytes() == b"%PDF-1.4 original\n"
|
||||||
|
|
||||||
|
|
||||||
|
def test_process_pdf_archive_name_collision(tmp_path: Path) -> None:
|
||||||
|
"""Bei Namens-Kollision im Archiv wird Timestamp angehängt."""
|
||||||
|
env = _prepare(tmp_path)
|
||||||
|
# Vorhandene Kollisions-Datei
|
||||||
|
(env["archive"] / "scan.pdf").write_bytes(b"old")
|
||||||
|
|
||||||
|
out_cfg = OutputConfig(name_mode="prefix", name_tag="OCR_",
|
||||||
|
original_on_success="archive",
|
||||||
|
archive_dir=str(env["archive"]))
|
||||||
|
with patch("pdf_ocr_hotfolder.processor.run_ocr", side_effect=_fake_ocr):
|
||||||
|
process_pdf(
|
||||||
|
src=env["src"],
|
||||||
|
working_dir=env["working"],
|
||||||
|
outgoing_dir=env["outgoing"],
|
||||||
|
error_dir=env["error"],
|
||||||
|
ocr_cfg=OcrConfig(),
|
||||||
|
vera_cfg=VeraPdfConfig(enabled=False),
|
||||||
|
output_cfg=out_cfg,
|
||||||
|
)
|
||||||
|
# Alte Datei unverändert
|
||||||
|
assert (env["archive"] / "scan.pdf").read_bytes() == b"old"
|
||||||
|
# Neue Datei mit Timestamp-Suffix
|
||||||
|
archived = list(env["archive"].glob("scan_*.pdf"))
|
||||||
|
assert len(archived) == 1
|
||||||
|
assert archived[0].read_bytes() == b"%PDF-1.4 original\n"
|
||||||
Reference in New Issue
Block a user