GOMODULES/go-exif
1
0
Fork 0
mirror of https://github.com/dsoprea/go-exif.git synced 2025-05-30 03:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

ifd_enumerate.go: Revert to using a simple function for the visitor

Browse Source
This commit is contained in:
Dustin Oprea 2020-01-13 18:12:07 -05:00
parent 90b66e3d11
commit 0bbb7a3584
4 changed files with 10 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
v2/exif-read-tool/main.go
View File

@ -46,26 +46,6 @@ type IfdEntry struct {
ValueString string `json:"value_string"`
}
type visitorFn func(fqIfdPath string, ifdIndex int, ite *exif.IfdTagEntry) (err error)
type visitorWrapper struct {
visitor visitorFn
}
func (vw *visitorWrapper) Visit(fqIfdPath string, ifdIndex int, ite *exif.IfdTagEntry) (err error) {
defer func() {
if state := recover(); state != nil {
err = log.Wrap(state.(error))
log.Panic(err)
}
}()
err = vw.visitor(fqIfdPath, ifdIndex, ite)
log.PanicIf(err)
return nil
}
func main() {
defer func() {
if state := recover(); state != nil {
@ -154,9 +134,7 @@ func main() {
return nil
}
vw := &visitorWrapper{visitor}
_, err = exif.Visit(exifcommon.IfdStandard, im, ti, rawExif, vw)
_, err = exif.Visit(exifcommon.IfdStandard, im, ti, rawExif, visitor)
log.PanicIf(err)
if printAsJsonArg == true {

2
v2/exif.go
View File

@ -177,7 +177,7 @@ func ParseExifHeader(data []byte) (eh ExifHeader, err error) {
}
// Visit recursively invokes a callback for every tag.
func Visit(rootIfdName string, ifdMapping *IfdMapping, tagIndex *TagIndex, exifData []byte, visitor RawTagWalk) (eh ExifHeader, err error) {
func Visit(rootIfdName string, ifdMapping *IfdMapping, tagIndex *TagIndex, exifData []byte, visitor TagVisitorFn) (eh ExifHeader, err error) {
defer func() {
if state := recover(); state != nil {
err = log.Wrap(state.(error))

16
v2/exif_test.go
View File

@ -15,16 +15,6 @@ import (
"github.com/dsoprea/go-exif/v2/common"
)
type innerVisitorCall func(fqIfdPath string, ifdIndex int, ite *IfdTagEntry) (err error)
type visitorWrapper struct {
f innerVisitorCall
}
func (vw *visitorWrapper) Visit(fqIfdPath string, ifdIndex int, ite *IfdTagEntry) (err error) {
return vw.f(fqIfdPath, ifdIndex, ite)
}
func TestVisit(t *testing.T) {
defer func() {
if state := recover(); state != nil {
@ -105,11 +95,7 @@ func TestVisit(t *testing.T) {
return nil
}
vw := &visitorWrapper{
f: visitor,
}
_, err = Visit(exifcommon.IfdStandard, im, ti, data[foundAt:], vw)
_, err = Visit(exifcommon.IfdStandard, im, ti, data[foundAt:], visitor)
log.PanicIf(err)
expected := []string{

21
v2/ifd_enumerate.go
View File

@ -205,19 +205,12 @@ func (ie *IfdEnumerate) parseTag(fqIfdPath string, tagPosition int, enumerator *
return ite, nil
}
// RawTagWalk is an optional callback that can get hit for every tag we parse
// through. `addressableData` is the byte array startign after the EXIF header
// (where the offsets of all IFDs and values are calculated from).
//
// This was reimplemented as an interface to allow for simpler change management
// in the future.
type RawTagWalk interface {
Visit(fqIfdPath string, ifdIndex int, ite *IfdTagEntry) (err error)
}
// TagVisitorFn is called for each tag when enumerating through the EXIF.
type TagVisitorFn func(fqIfdPath string, ifdIndex int, ite *IfdTagEntry) (err error)
// ParseIfd decodes the IFD block that we're currently sitting on the first
// byte of.
func (ie *IfdEnumerate) ParseIfd(fqIfdPath string, ifdIndex int, enumerator *IfdTagEnumerator, visitor RawTagWalk, doDescend bool) (nextIfdOffset uint32, entries []*IfdTagEntry, thumbnailData []byte, err error) {
func (ie *IfdEnumerate) ParseIfd(fqIfdPath string, ifdIndex int, enumerator *IfdTagEnumerator, visitor TagVisitorFn, doDescend bool) (nextIfdOffset uint32, entries []*IfdTagEntry, thumbnailData []byte, err error) {
defer func() {
if state := recover(); state != nil {
err = log.Wrap(state.(error))
@ -256,7 +249,7 @@ func (ie *IfdEnumerate) ParseIfd(fqIfdPath string, ifdIndex int, enumerator *Ifd
}
if visitor != nil {
err := visitor.Visit(fqIfdPath, ifdIndex, ite)
err := visitor(fqIfdPath, ifdIndex, ite)
log.PanicIf(err)
}
@ -316,7 +309,7 @@ func (ie *IfdEnumerate) parseThumbnail(offsetIte, lengthIte *IfdTagEntry) (thumb
}
// Scan enumerates the different EXIF's IFD blocks.
func (ie *IfdEnumerate) scan(fqIfdName string, ifdOffset uint32, visitor RawTagWalk) (err error) {
func (ie *IfdEnumerate) scan(fqIfdName string, ifdOffset uint32, visitor TagVisitorFn) (err error) {
defer func() {
if state := recover(); state != nil {
err = log.Wrap(state.(error))
@ -342,7 +335,7 @@ func (ie *IfdEnumerate) scan(fqIfdName string, ifdOffset uint32, visitor RawTagW
// Scan enumerates the different EXIF blocks (called IFDs). `rootIfdName` will
// be "IFD" in the TIFF standard.
func (ie *IfdEnumerate) Scan(rootIfdName string, ifdOffset uint32, visitor RawTagWalk) (err error) {
func (ie *IfdEnumerate) Scan(rootIfdName string, ifdOffset uint32, visitor TagVisitorFn) (err error) {
defer func() {
if state := recover(); state != nil {
err = log.Wrap(state.(error))
@ -1102,7 +1095,7 @@ func (ie *IfdEnumerate) setChildrenIndex(ifd *Ifd) (err error) {
// ParseOneIfd is a hack to use an IE to parse a raw IFD block. Can be used for
// testing.
func ParseOneIfd(ifdMapping *IfdMapping, tagIndex *TagIndex, fqIfdPath, ifdPath string, byteOrder binary.ByteOrder, ifdBlock []byte, visitor RawTagWalk) (nextIfdOffset uint32, entries []*IfdTagEntry, err error) {
func ParseOneIfd(ifdMapping *IfdMapping, tagIndex *TagIndex, fqIfdPath, ifdPath string, byteOrder binary.ByteOrder, ifdBlock []byte, visitor TagVisitorFn) (nextIfdOffset uint32, entries []*IfdTagEntry, err error) {
defer func() {
if state := recover(); state != nil {
err = log.Wrap(state.(error))