-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes dsoprea/go-exif#58
- Loading branch information
Showing
6 changed files
with
231 additions
and
9 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,144 @@ | ||
package webp | ||
|
||
import ( | ||
"bytes" | ||
"io" | ||
"os" | ||
|
||
"github.com/dsoprea/go-exif/v3" | ||
"github.com/dsoprea/go-exif/v3/common" | ||
"github.com/dsoprea/go-logging/v2" | ||
"github.com/dsoprea/go-utility/v2/image" | ||
) | ||
|
||
// WebpMediaParser is a `riimage.MediaParser` that knows how to parse JPEG | ||
// images. | ||
type WebpMediaParser struct { | ||
} | ||
|
||
// NewWebpMediaParser returns a new WebpMediaParser. | ||
func NewWebpMediaParser() *WebpMediaParser { | ||
|
||
// TODO(dustin): Add test | ||
|
||
return new(WebpMediaParser) | ||
} | ||
|
||
type RawExifData []byte | ||
|
||
// Exif returns the EXIF's root IFD. | ||
func (ref RawExifData) Exif() (rootIfd *exif.Ifd, data []byte, err error) { | ||
defer func() { | ||
if state := recover(); state != nil { | ||
err = log.Wrap(state.(error)) | ||
} | ||
}() | ||
|
||
im, err := exifcommon.NewIfdMappingWithStandard() | ||
log.PanicIf(err) | ||
|
||
ti := exif.NewTagIndex() | ||
|
||
_, index, err := exif.Collect(im, ti, ref) | ||
log.PanicIf(err) | ||
|
||
return index.RootIfd, ref, nil | ||
} | ||
|
||
// Parse parses a JPEG uses an `io.ReadSeeker`. Even if it fails, it will return | ||
// the list of segments encountered prior to the failure. | ||
func (wmp *WebpMediaParser) Parse(rs io.ReadSeeker, size int) (mc riimage.MediaContext, err error) { | ||
defer func() { | ||
if state := recover(); state != nil { | ||
err = log.Wrap(state.(error)) | ||
} | ||
}() | ||
|
||
wp := NewWebpParser(rs) | ||
|
||
visitorCb := func(fourCc [4]byte, dataGetter DataGetterFunc) (err error) { | ||
if fourCc != exifFourCc { | ||
return nil | ||
} | ||
|
||
exifData, err := dataGetter() | ||
log.PanicIf(err) | ||
|
||
mc = RawExifData(exifData) | ||
|
||
return nil | ||
} | ||
|
||
err = wp.enumerateChunks(visitorCb) | ||
log.PanicIf(err) | ||
|
||
if mc != nil { | ||
return mc, nil | ||
} | ||
|
||
return nil, exif.ErrNoExif | ||
} | ||
|
||
// ParseFile parses a JPEG file. Even if it fails, it will return the list of | ||
// segments encountered prior to the failure. | ||
func (wmp *WebpMediaParser) ParseFile(filepath string) (mc riimage.MediaContext, err error) { | ||
defer func() { | ||
if state := recover(); state != nil { | ||
err = log.Wrap(state.(error)) | ||
} | ||
}() | ||
|
||
// TODO(dustin): Add test | ||
|
||
f, err := os.Open(filepath) | ||
log.PanicIf(err) | ||
|
||
defer f.Close() | ||
|
||
stat, err := f.Stat() | ||
log.PanicIf(err) | ||
|
||
size := stat.Size() | ||
|
||
mc, err = wmp.Parse(f, int(size)) | ||
log.PanicIf(err) | ||
|
||
return mc, nil | ||
} | ||
|
||
// ParseBytes parses a JPEG byte-slice. Even if it fails, it will return the | ||
// list of segments encountered prior to the failure. | ||
func (wmp *WebpMediaParser) ParseBytes(data []byte) (mc riimage.MediaContext, err error) { | ||
defer func() { | ||
if state := recover(); state != nil { | ||
err = log.Wrap(state.(error)) | ||
} | ||
}() | ||
|
||
br := bytes.NewReader(data) | ||
|
||
mc, err = wmp.Parse(br, len(data)) | ||
log.PanicIf(err) | ||
|
||
return mc, nil | ||
} | ||
|
||
// LooksLikeFormat indicates whether the data looks like a JPEG image. | ||
func (wmp *WebpMediaParser) LooksLikeFormat(data []byte) bool { | ||
defer func() { | ||
if errRaw := recover(); errRaw != nil { | ||
log.Panic(errRaw.(error)) | ||
} | ||
}() | ||
|
||
br := bytes.NewReader(data) | ||
wp := NewWebpParser(br) | ||
|
||
_, err := wp.readHeader() | ||
return err == nil | ||
} | ||
|
||
var ( | ||
// Enforce interface conformance. | ||
_ riimage.MediaParser = new(WebpMediaParser) | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
package webp | ||
|
||
import ( | ||
"os" | ||
"testing" | ||
|
||
"io/ioutil" | ||
|
||
"github.com/dsoprea/go-exif/v3/common" | ||
"github.com/dsoprea/go-logging/v2" | ||
) | ||
|
||
func TestWebpMediaParser_ParseBytes(t *testing.T) { | ||
wmp := NewWebpMediaParser() | ||
|
||
filepath := GetTestImageFilepath() | ||
|
||
// f, err := os.Open(filepath) | ||
// log.PanicIf(err) | ||
|
||
// defer f.Close() | ||
|
||
data, err := ioutil.ReadFile(filepath) | ||
log.PanicIf(err) | ||
|
||
// f, err := os.Open(filepath) | ||
// log.PanicIf(err) | ||
|
||
// defer f.Close() | ||
|
||
mc, err := wmp.ParseBytes(data) | ||
log.PanicIf(err) | ||
|
||
rootIfd, _, err := mc.Exif() | ||
log.PanicIf(err) | ||
|
||
ii := rootIfd.IfdIdentity() | ||
if ii != exifcommon.IfdStandardIfdIdentity { | ||
t.Fatalf("Root IFD is not the correct type: [%s]", ii) | ||
} | ||
} | ||
|
||
func TestWebpMediaParser_ParseFile(t *testing.T) { | ||
wmp := NewWebpMediaParser() | ||
|
||
filepath := GetTestImageFilepath() | ||
|
||
mc, err := wmp.ParseFile(filepath) | ||
log.PanicIf(err) | ||
|
||
rootIfd, _, err := mc.Exif() | ||
log.PanicIf(err) | ||
|
||
ii := rootIfd.IfdIdentity() | ||
if ii != exifcommon.IfdStandardIfdIdentity { | ||
t.Fatalf("Root IFD is not the correct type: [%s]", ii) | ||
} | ||
} | ||
|
||
func TestWebpMediaParser_Parse(t *testing.T) { | ||
wmp := NewWebpMediaParser() | ||
|
||
filepath := GetTestImageFilepath() | ||
|
||
f, err := os.Open(filepath) | ||
log.PanicIf(err) | ||
|
||
defer f.Close() | ||
|
||
mc, err := wmp.Parse(f, 0) | ||
log.PanicIf(err) | ||
|
||
rootIfd, _, err := mc.Exif() | ||
log.PanicIf(err) | ||
|
||
ii := rootIfd.IfdIdentity() | ||
if ii != exifcommon.IfdStandardIfdIdentity { | ||
t.Fatalf("Root IFD is not the correct type: [%s]", ii) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters