1 files changed, 3 insertions, 27 deletions
diff --git a/pkg/worker/exif_scanner.go b/pkg/worker/exif_scanner.go
index 4aa247d..91eed12 100644
--- a/pkg/worker/exif_scanner.go
+++ b/pkg/worker/exif_scanner.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"git.sr.ht/~gabrielgio/img/pkg/components/media"
+	"git.sr.ht/~gabrielgio/img/pkg/coroutine"
 	"git.sr.ht/~gabrielgio/img/pkg/fileop"
 )
 
@@ -33,36 +34,11 @@ func (e *EXIFScanner) Query(ctx context.Context) ([]*media.Media, error) {
 	return medias, nil
 }
 
-func wrapReadExif(ctx context.Context, path string) (*media.MediaEXIF, error) {
-	c := make(chan *media.MediaEXIF)
-	e := make(chan error)
-	go func() {
-		defer close(c)
-		defer close(e)
-
-		newExif, err := fileop.ReadExif(path)
-		if err != nil {
-			e <- err
-		} else {
-			c <- newExif
-		}
-	}()
-
-	select {
-	case <-ctx.Done():
-		return nil, ctx.Err()
-	case m := <-c:
-		return m, nil
-	case err := <-e:
-		return nil, err
-	}
-}
-
 func (e *EXIFScanner) Process(ctx context.Context, m *media.Media) error {
-	newExif, err := wrapReadExif(ctx, m.Path)
+	exif, err := coroutine.WrapProcess(ctx, func() (*media.MediaEXIF, error) { return fileop.ReadExif(m.Path) })
 	if err != nil {
 		return err
 	}
 
-	return e.repository.CreateEXIF(ctx, m.ID, newExif)
+	return e.repository.CreateEXIF(ctx, m.ID, exif)
 }