Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exif: make DateTime return time.Local location when unknown timezone 

Change-Id: Id3ea677389e3e2e4e765116e85c0c60fb74fdff8
This commit is contained in:
Brad Fitzpatrick 2014-07-13 10:22:45 -07:00
parent 995a4ccb0e
commit a827380644
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
third_party/github.com/camlistore/goexif/exif/exif.go vendored
View File

@ -202,8 +202,10 @@ func (x *Exif) Walk(w Walker) error {
// The error will be TagNotPresentErr if none of those tags
// were found, or a generic error if the tag value was
// not a string, or the error returned by time.Parse.
//
// If the EXIF lacks timezone information or GPS time, the returned
// time's Location will be time.Local.
func (x *Exif) DateTime() (time.Time, error) {
// TODO(mpl): investigate the time zone question.
var dt time.Time
tag, err := x.Get(DateTimeOriginal)
if err != nil {
@ -217,7 +219,9 @@ func (x *Exif) DateTime() (time.Time, error) {
}
exifTimeLayout := "2006:01:02 15:04:05"
dateStr := strings.TrimRight(string(tag.Val), "\x00")
return time.Parse(exifTimeLayout, dateStr)
// TODO(bradfitz,mpl): look for timezone offset, GPS time, etc.
// For now, just always return the time.Local timezone.
return time.ParseInLocation(exifTimeLayout, dateStr, time.Local)
}
// String returns a pretty text representation of the decoded exif data.