Work

go.mod

@@ -72,3 +72,6 @@ require (
 )
 
 go 1.16
+
+
+replace github.com/dsoprea/go-exif/v3 => /Users/bep/dev/go/dump/go-exif/v3

resources/images/exif/exif.go

@@ -44,6 +44,9 @@ type Decoder struct {
 	excludeFieldsrRe *regexp.Regexp
 	noDate           bool
 	noLatLong        bool
+
+	idfm *exifcommon.IfdMapping
+	ti   *_exif.TagIndex
 }
 
 func IncludeFields(expression string) func(*Decoder) error {
@@ -96,7 +99,12 @@ func compileRegexp(expression string) (*regexp.Regexp, error) {
 }
 
 func NewDecoder(options ...func(*Decoder) error) (*Decoder, error) {
-	d := &Decoder{}
+	im, err := exifcommon.NewIfdMappingWithStandard()
+	if err != nil {
+		return nil, err
+	}
+	ti := _exif.NewTagIndex()
+	d := &Decoder{idfm: im, ti: ti}
 	for _, opt := range options {
 		if err := opt(d); err != nil {
 			return nil, err
@@ -114,13 +122,7 @@ func (d *Decoder) Decode(r io.Reader) (*Exif, error) {
 		return nil, nil
 	}
 
-	im, err := exifcommon.NewIfdMappingWithStandard()
-	if err != nil {
-		return nil, err
-	}
-	ti := _exif.NewTagIndex()
-
-	_, index, err := _exif.Collect(im, ti, rawExif)
+	_, index, err := _exif.Collect(d.idfm, d.ti, rawExif)
 	if err != nil {
 		return nil, err
 	}

resources/images/exif/exif_test.go

@@ -14,13 +14,16 @@
 package exif
 
 import (
+	"context"
 	"encoding/json"
+	"errors"
 	"math/big"
 	"os"
 	"path/filepath"
 	"testing"
 	"time"
 
+	"github.com/gohugoio/hugo/common/para"
 	"github.com/gohugoio/hugo/htesting/hqt"
 	"github.com/google/go-cmp/cmp"
 
@@ -62,6 +65,42 @@ func TestExif(t *testing.T) {
 	c.Assert(x2, eq, x)
 }
 
+func TestExifParallel(t *testing.T) {
+	c := qt.New(t)
+
+	d, err := NewDecoder(IncludeFields("Lens|Date"))
+	c.Assert(err, qt.IsNil)
+
+	p := para.New(4)
+	r, _ := p.Start(context.Background())
+
+	for i := 0; i < 20; i++ {
+		r.Run(func() error {
+			f, err := os.Open(filepath.FromSlash("../../testdata/sunset.jpg"))
+			if err != nil {
+				return err
+			}
+			defer f.Close()
+
+			x, err := d.Decode(f)
+			if err != nil {
+				return err
+			}
+
+			if x.Date.Format("2006-01-02") != "2017-10-27" {
+				return errors.New("invalid date")
+			}
+
+			return nil
+
+		})
+
+	}
+
+	c.Assert(r.Wait(), qt.IsNil)
+
+}
+
 func TestImageWithoutExifData(t *testing.T) {
 	c := qt.New(t)
 	f, err := os.Open(filepath.FromSlash("../../testdata/sunset_without_exif.jpg"))