GOMODULES
/
go-exif
mirror of https://github.com/dsoprea/go-exif.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

utility.go: Can now get flat from an RS. Add missing tests.

pull/69/head
Dustin Oprea 2021-05-12 01:50:20 -04:00
parent 120bcdb2a5
commit 8213cfabc6
2 changed files with 88 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
v3/utility.go
View File

@ -2,9 +2,11 @@ package exif
import (
"fmt"
"io"
"math"
"github.com/dsoprea/go-logging"
"github.com/dsoprea/go-utility/v2/filesystem"
"github.com/dsoprea/go-exif/v3/common"
"github.com/dsoprea/go-exif/v3/undefined"
@ -76,7 +78,9 @@ func GetFlatExifData(exifData []byte, so *ScanOptions) (exifTags []ExifTag, med
}
}()
exifTags, med, err = getFlatExifDataUniversalSearch(exifData, so, false)
sb := rifs.NewSeekableBufferWithBytes(exifData)
exifTags, med, err = getFlatExifDataUniversalSearchWithReadSeeker(sb, so, false)
log.PanicIf(err)
return exifTags, med, nil
@ -84,7 +88,8 @@ func GetFlatExifData(exifData []byte, so *ScanOptions) (exifTags []ExifTag, med
// RELEASE(dustin): GetFlatExifDataUniversalSearch is a kludge to allow univeral tag searching in a backwards-compatible manner. For the next release, undo this and simply add the flag to GetFlatExifData.
// GetFlatExifDataUniversalSearch returns a simple, flat representation of all tags.
// GetFlatExifDataUniversalSearch returns a simple, flat representation of all
// tags.
func GetFlatExifDataUniversalSearch(exifData []byte, so *ScanOptions, doUniversalSearch bool) (exifTags []ExifTag, med *MiscellaneousExifData, err error) {
defer func() {
if state := recover(); state != nil {
@ -92,21 +97,50 @@ func GetFlatExifDataUniversalSearch(exifData []byte, so *ScanOptions, doUniversa
}
}()
exifTags, med, err = getFlatExifDataUniversalSearch(exifData, so, doUniversalSearch)
sb := rifs.NewSeekableBufferWithBytes(exifData)
exifTags, med, err = getFlatExifDataUniversalSearchWithReadSeeker(sb, so, doUniversalSearch)
log.PanicIf(err)
return exifTags, med, nil
}
// GetFlatExifData returns a simple, flat representation of all tags.
func getFlatExifDataUniversalSearch(exifData []byte, so *ScanOptions, doUniversalSearch bool) (exifTags []ExifTag, med *MiscellaneousExifData, err error) {
// RELEASE(dustin): GetFlatExifDataUniversalSearchWithReadSeeker is a kludge to allow using a ReadSeeker in a backwards-compatible manner. For the next release, drop this and refactor GetFlatExifDataUniversalSearch to take a ReadSeeker.
// GetFlatExifDataUniversalSearchWithReadSeeker returns a simple, flat
// representation of all tags given a ReadSeeker.
func GetFlatExifDataUniversalSearchWithReadSeeker(rs io.ReadSeeker, so *ScanOptions, doUniversalSearch bool) (exifTags []ExifTag, med *MiscellaneousExifData, err error) {
defer func() {
if state := recover(); state != nil {
err = log.Wrap(state.(error))
}
}()
eh, err := ParseExifHeader(exifData)
exifTags, med, err = getFlatExifDataUniversalSearchWithReadSeeker(rs, so, doUniversalSearch)
log.PanicIf(err)
return exifTags, med, nil
}
// getFlatExifDataUniversalSearchWithReadSeeker returns a simple, flat
// representation of all tags given a ReadSeeker.
func getFlatExifDataUniversalSearchWithReadSeeker(rs io.ReadSeeker, so *ScanOptions, doUniversalSearch bool) (exifTags []ExifTag, med *MiscellaneousExifData, err error) {
defer func() {
if state := recover(); state != nil {
err = log.Wrap(state.(error))
}
}()
headerData := make([]byte, ExifSignatureLength)
if _, err = io.ReadFull(rs, headerData); err != nil {
if err == io.EOF {
return nil, nil, err
}
log.Panic(err)
}
eh, err := ParseExifHeader(headerData)
log.PanicIf(err)
im, err := exifcommon.NewIfdMappingWithStandard()
@ -118,7 +152,7 @@ func getFlatExifDataUniversalSearch(exifData []byte, so *ScanOptions, doUniversa
ti.SetUniversalSearch(true)
}
ebs := NewExifReadSeekerWithBytes(exifData)
ebs := NewExifReadSeeker(rs)
ie := NewIfdEnumerate(im, ti, ebs, eh.ByteOrder)
exifTags = make([]ExifTag, 0)

47
v3/utility_test.go
View File

@ -1,7 +1,11 @@
package exif
import (
"os"
"testing"
"github.com/dsoprea/go-logging/v2"
"github.com/dsoprea/go-utility/v2/filesystem"
)
func TestGpsDegreesEquals_Equals(t *testing.T) {
@ -51,3 +55,46 @@ func TestGpsDegreesEquals_NotEqual_Position(t *testing.T) {
t.Fatalf("GpsDegrees structs were equal but not supposed to be.")
}
}
func TestGetFlatExifData(t *testing.T) {
testExifData := getTestExifData()
exifTags, _, err := GetFlatExifData(testExifData, nil)
log.PanicIf(err)
if len(exifTags) != 59 {
t.Fatalf("Tag count not correct: (%d)", len(exifTags))
}
}
func TestGetFlatExifDataUniversalSearch(t *testing.T) {
testExifData := getTestExifData()
exifTags, _, err := GetFlatExifDataUniversalSearch(testExifData, nil, false)
log.PanicIf(err)
if len(exifTags) != 59 {
t.Fatalf("Tag count not correct: (%d)", len(exifTags))
}
}
func TestGetFlatExifDataUniversalSearchWithReadSeeker(t *testing.T) {
testImageFilepath := getTestImageFilepath()
f, err := os.Open(testImageFilepath)
log.PanicIf(err)
defer f.Close()
rawExif, err := SearchAndExtractExifWithReader(f)
log.PanicIf(err)
sb := rifs.NewSeekableBufferWithBytes(rawExif)
exifTags, _, err := GetFlatExifDataUniversalSearchWithReadSeeker(sb, nil, false)
log.PanicIf(err)
if len(exifTags) != 59 {
t.Fatalf("Tag count not correct: (%d)", len(exifTags))
}
}