m
d5886c678b
- ocr/tesseract.go : Engine → Tesseract subprocess (OCR_LANG fra+eng) ; PDF → calque texte via ledongthuc/pdf (go.mod : nouveau dep) - repository/ocr_jobs.go : queued→processing→done/failed, scoping device, text/error NULLIFés - service/ocr.go : Create valide le fichier (GetFile), queue + goroutine de traitement ; physique résolu par glob UPLOAD_DIR/<device>/<id>.* ; fail propre (fichier illisible, erreur moteur) - handlers/ocr.go : réels (validate fileId, NOT_FOUND si job d'un autre device), fin 501 OCR - tests end-to-end : cycle queued→done (stub moteur), NOT_FOUND fichier inconnu, scoping device - smoke réel : PNG 'VAULTDROP' → job done text='VAULTDROP' (tesseract installé) - docs/AGENTS : §5 + état des routes (tout V1 réel)
97 lines
2.6 KiB
Go
97 lines
2.6 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/vaultdrop/backend/ocr"
|
|
"github.com/vaultdrop/backend/repository"
|
|
)
|
|
|
|
// OcrJobDTO serializes exactly as mobile/api/types.ts OcrJob.
|
|
type OcrJobDTO struct {
|
|
ID string `json:"id"`
|
|
Status string `json:"status"`
|
|
Text string `json:"text,omitempty"`
|
|
Error string `json:"error,omitempty"`
|
|
}
|
|
|
|
// Ocr queues OCR jobs and processes them asynchronously (V1 : goroutine par
|
|
// job ; le client poll GET /ocr/jobs/:id toutes les 3s).
|
|
type Ocr struct {
|
|
Repository *repository.Repository
|
|
UploadDir string
|
|
Lang string
|
|
Engine ocr.Engine
|
|
}
|
|
|
|
func NewOcr(repo *repository.Repository, uploadDir, lang string, engine ocr.Engine) *Ocr {
|
|
return &Ocr{Repository: repo, UploadDir: uploadDir, Lang: lang, Engine: engine}
|
|
}
|
|
|
|
// Create validates the file, queued the job, and starts processing.
|
|
func (o *Ocr) Create(deviceID, fileID string) (OcrJobDTO, error) {
|
|
if _, err := o.Repository.Resources.GetFile(deviceID, fileID); err != nil {
|
|
return OcrJobDTO{}, err
|
|
}
|
|
jobID := repository.NewID()
|
|
if err := o.Repository.OcrJobs.Create(jobID, deviceID, fileID); err != nil {
|
|
return OcrJobDTO{}, err
|
|
}
|
|
go o.process(deviceID, jobID, fileID)
|
|
return OcrJobDTO{ID: jobID, Status: "queued"}, nil
|
|
}
|
|
|
|
func (o *Ocr) Get(deviceID, jobID string) (OcrJobDTO, error) {
|
|
row, err := o.Repository.OcrJobs.Get(deviceID, jobID)
|
|
if err != nil {
|
|
return OcrJobDTO{}, err
|
|
}
|
|
return toOcrJobDTO(row), nil
|
|
}
|
|
|
|
func (o *Ocr) process(deviceID, jobID, fileID string) {
|
|
ctx := context.Background()
|
|
if err := o.Repository.OcrJobs.TouchProcessing(deviceID, jobID); err != nil {
|
|
return
|
|
}
|
|
path, err := o.physicalPath(deviceID, fileID)
|
|
if err != nil {
|
|
_ = o.Repository.OcrJobs.Fail(deviceID, jobID, "file not readable")
|
|
return
|
|
}
|
|
text, err := o.Engine.ExtractText(ctx, path, o.Lang)
|
|
if err != nil {
|
|
_ = o.Repository.OcrJobs.Fail(deviceID, jobID, err.Error())
|
|
return
|
|
}
|
|
_ = o.Repository.OcrJobs.Complete(deviceID, jobID, text)
|
|
}
|
|
|
|
// physicalPath resolves UPLOAD_DIR/<device_id>/<resource_id>.<ext> — the ext
|
|
// is chosen at upload time, so the actual file is matched by prefix.
|
|
func (o *Ocr) physicalPath(deviceID, fileID string) (string, error) {
|
|
matches, err := filepath.Glob(filepath.Join(o.UploadDir, deviceID, fileID+".*"))
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
for _, m := range matches {
|
|
if strings.HasPrefix(filepath.Base(m), fileID+".") {
|
|
return m, nil
|
|
}
|
|
}
|
|
return "", repository.ErrNotFound
|
|
}
|
|
|
|
func toOcrJobDTO(row repository.OcrJobRow) OcrJobDTO {
|
|
dto := OcrJobDTO{ID: row.ID, Status: row.Status}
|
|
if row.Text != nil {
|
|
dto.Text = *row.Text
|
|
}
|
|
if row.Error != nil {
|
|
dto.Error = *row.Error
|
|
}
|
|
return dto
|
|
}
|