Thirdshop/Kazier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ocr pipeline

Browse Source
This commit is contained in:
m
2026-09-15 23:52:19 +02:00
parent 102cc425b9
commit 050434325a
21 changed files with 1028 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/service/resources.go
+26 -5
View File
@@ -104,30 +104,51 @@ func (s *Resources) SearchFiles(ownerID, q string, page, pageSize int) ([]FileDT
// Upload persists the multipart-sourced file under UploadDir/<user> and
// records its metadata, returning the FileDTO. The physical file is removed
// if metadata persistence fails (e.g. name conflict).
func (s *Resources) Upload(ownerID string, file *multipart.FileHeader, folderID string) (FileDTO, error) {
//
// When resourceID is non-empty the upload TARGETS an existing file owned by
// the user (metadata-only resource from the outbox, or a previously uploaded
// file): the bytes are written under UploadDir/<user>/<resourceID>.<ext> and
// only the physical metadata (size/mime/extension) is refreshed — never a
// rename, never a move, never a duplicate row. Unknown / foreign resource →
// repo.ErrNotFound.
func (s *Resources) Upload(ownerID string, file *multipart.FileHeader, folderID, resourceID string) (FileDTO, error) {
if file.Size > s.MaxFileSize {
return FileDTO{}, ErrFileTooLarge
}
id := repository.NewID()
targetExisting := resourceID != ""
if targetExisting {
if _, err := s.Repo.GetFile(ownerID, resourceID); err != nil {
return FileDTO{}, err
}
} else {
resourceID = repository.NewID()
}
extension := strings.TrimPrefix(filepath.Ext(file.Filename), ".")
destDir := filepath.Join(s.UploadDir, ownerID)
if err := os.MkdirAll(destDir, 0o755); err != nil {
return FileDTO{}, fmt.Errorf("create upload dir: %w", err)
}
destPath := filepath.Join(destDir, id+"."+extension)
destPath := filepath.Join(destDir, resourceID+"."+extension)
if err := copyMultipart(file, destPath); err != nil {
return FileDTO{}, err
}
mimeType := file.Header.Get("Content-Type")
if err := s.Repo.InsertFile(ownerID, id, file.Filename, folderID, file.Size, &mimeType, &extension); err != nil {
var err error
if targetExisting {
err = s.Repo.UpdatePhysical(ownerID, resourceID, file.Size, &mimeType, &extension)
} else {
err = s.Repo.InsertFile(ownerID, resourceID, file.Filename, folderID, file.Size, &mimeType, &extension)
}
if err != nil {
_ = os.Remove(destPath)
return FileDTO{}, err
}
row, err := s.Repo.GetFile(ownerID, id)
row, err := s.Repo.GetFile(ownerID, resourceID)
if err != nil {
return FileDTO{}, err
}
backend/service/resources_test.go
+74 -3
View File
@@ -42,7 +42,7 @@ func TestUploadPersistsPhysicalFile(t *testing.T) {
s := newServiceStore(t)
userID := mustCreateUser(t, s.Repository, "upload-happy")
dto, err := s.Upload(userID, multipartFileHeader(t, "docs.txt", []byte("hello")), "")
dto, err := s.Upload(userID, multipartFileHeader(t, "docs.txt", []byte("hello")), "", "")
if err != nil {
t.Fatalf("upload: %v", err)
}
@@ -70,7 +70,7 @@ func TestUploadRemovesPhysicalFileOnNameConflict(t *testing.T) {
}
target := multipartFileHeader(t, "dupe.txt", []byte("hello"))
first, err := s.Upload(userID, target, folderID)
first, err := s.Upload(userID, target, folderID, "")
if err != nil {
t.Fatalf("premier upload: %v", err)
}
@@ -79,7 +79,7 @@ func TestUploadRemovesPhysicalFileOnNameConflict(t *testing.T) {
}
// Même nom, même dossier → NAME_CONFLICT et pas de second fichier physique.
if _, err := s.Upload(userID, target, folderID); !errors.Is(err, repository.ErrNameConflict) {
if _, err := s.Upload(userID, target, folderID, ""); !errors.Is(err, repository.ErrNameConflict) {
t.Fatalf("second upload : attendu ErrNameConflict, got %v", err)
}
@@ -91,3 +91,74 @@ func TestUploadRemovesPhysicalFileOnNameConflict(t *testing.T) {
t.Errorf("fichier orphelin laissé après NAME_CONFLICT : %d fichiers", len(entries))
}
}
func TestUploadTargetsExistingResource(t *testing.T) {
s := newServiceStore(t)
userID := mustCreateUser(t, s.Repository, "upload-target")
// Fiche metadata-only créée par l'outbox côté client.
resourceID := repository.NewID()
ext := "png"
if err := s.Repository.Resources.InsertFile(userID, resourceID, "scan.png", "", 0, nil, &ext); err != nil {
t.Fatalf("insert metadata-only file: %v", err)
}
// Re-upload ciblé : mêmes octets, même resource_id, pas de doublon.
dto, err := s.Upload(userID, multipartFileHeader(t, "scan.png", []byte("PNGDATA")), "", resourceID)
if err != nil {
t.Fatalf("targeted upload: %v", err)
}
if dto.ID != resourceID {
t.Errorf("id attendu %s, got %s", resourceID, dto.ID)
}
if dto.Size != 7 {
t.Errorf("taille = %d, attendu 7 (rafraîchie)", dto.Size)
}
path := filepath.Join(s.UploadDir, userID, resourceID+".png")
info, err := os.Stat(path)
if err != nil {
t.Fatalf("fichier physique absent: %v", err)
}
if info.Size() != 7 {
t.Errorf("taille physique = %d, attendu 7", info.Size())
}
// Une seule ligne serveur (pas de doublon créé par le re-upload).
rows, total, err := s.Repo.ListFiles(userID, "", 50, 0, "", "")
if err != nil {
t.Fatalf("list: %v", err)
}
if total != 1 || len(rows) != 1 || rows[0].ID != resourceID {
t.Errorf("liste après re-upload: total=%d rows=%+v", total, rows)
}
}
func TestUploadTargetsOwnedResourceOnly(t *testing.T) {
s := newServiceStore(t)
userID := mustCreateUser(t, s.Repository, "upload-owner")
otherUser := mustCreateUser(t, s.Repository, "upload-owner-other")
resourceID := repository.NewID()
if err := s.Repository.Resources.InsertFile(otherUser, resourceID, "mine.png", "", 0, nil, nil); err != nil {
t.Fatalf("insert other's file: %v", err)
}
// Un resource_id d'un autre user → ErrNotFound, aucun octet écrit.
if _, err := s.Upload(userID, multipartFileHeader(t, "mine.png", []byte("DATA")), "", resourceID); !errors.Is(err, repository.ErrNotFound) {
t.Fatalf("upload cross-user : attendu ErrNotFound, got %v", err)
}
// Le dossier upload du user ne doit pas avoir été créé (échec avant écriture).
if _, err := os.Stat(filepath.Join(s.UploadDir, userID)); !os.IsNotExist(err) {
t.Errorf("dossier upload créé à tort ou erreur inattendue: %v", err)
}
}
func TestUploadTargetUnknownIsNotFound(t *testing.T) {
s := newServiceStore(t)
userID := mustCreateUser(t, s.Repository, "upload-unknown")
if _, err := s.Upload(userID, multipartFileHeader(t, "ghost.png", []byte("DATA")), "", repository.NewID()); !errors.Is(err, repository.ErrNotFound) {
t.Fatalf("upload inconnu : attendu ErrNotFound, got %v", err)
}
}