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

Merge "pkg/index/receive: unless CAMLI_DEBUG_IMAGES, be less EXIF-verbose"

This commit is contained in:
Mathieu Lonjaret 2015-10-23 13:48:52 +00:00 committed by Gerrit Code Review
parent afa5d42469 2b2ad502e5
commit 69d3f9c937
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/index/receive.go
View File

@ -27,6 +27,7 @@ import (
"log"
"os"
"sort"
"strconv"
"strings"
"sync"
"time"
@ -384,6 +385,8 @@ func readPrefixOrFile(prefix []byte, fetcher blob.Fetcher, b *schema.Blob, fn fu
return err
}
var exifDebug, _ = strconv.ParseBool(os.Getenv("CAMLI_DEBUG_IMAGES"))
// b: the parsed file schema blob
// mm: keys to populate
func (ix *Index) populateFile(fetcher blob.Fetcher, b *schema.Blob, mm *mutationMap) (err error) {
@ -429,14 +432,18 @@ func (ix *Index) populateFile(fetcher blob.Fetcher, b *schema.Blob, mm *mutation
if err = readPrefixOrFile(imageBuf.Bytes, fetcher, b, fileTime); err == nil {
times = append(times, ft)
}
log.Printf("filename %q exif = %v, %v", b.FileName(), ft, err)
if exifDebug {
log.Printf("filename %q exif = %v, %v", b.FileName(), ft, err)
}
// TODO(mpl): find (generate?) more broken EXIF images to experiment with.
indexEXIFData := func(r filePrefixReader) error {
return indexEXIF(wholeRef, r, mm)
}
if err = readPrefixOrFile(imageBuf.Bytes, fetcher, b, indexEXIFData); err != nil {
log.Printf("error parsing EXIF: %v", err)
if exifDebug {
log.Printf("error parsing EXIF: %v", err)
}
}
}