luisgulo/photoprism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backend: Add info to metadata logs

Browse Source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-07-02 08:26:15 +02:00
parent 4721f9d044
commit 636b56008b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/meta/exif.go
View File

@ -61,7 +61,7 @@ func (data *Data) Exif(fileName string) (err error) {
if err.Error() == "no exif header" {
return fmt.Errorf("metadata: no exif header in %s", txt.Quote(filepath.Base(fileName)))
} else {
log.Warnf("metadata: %s in %s", err, txt.Quote(filepath.Base(fileName)))
log.Warnf("metadata: %s in %s (parse jpeg)", err, txt.Quote(filepath.Base(fileName)))
}
} else {
parsed = true
@ -81,7 +81,7 @@ func (data *Data) Exif(fileName string) (err error) {
if err.Error() == "file does not have EXIF" {
return fmt.Errorf("metadata: no exif header in %s", txt.Quote(filepath.Base(fileName)))
} else {
log.Warnf("metadata: %s in %s", err, txt.Quote(filepath.Base(fileName)))
log.Warnf("metadata: %s in %s (parse png)", err, txt.Quote(filepath.Base(fileName)))
}
} else {
parsed = true
@ -95,7 +95,7 @@ func (data *Data) Exif(fileName string) (err error) {
rawExif, err = exif.SearchFileAndExtractExif(fileName)
if err != nil {
return fmt.Errorf("metadata: no exif header in %s", txt.Quote(filepath.Base(fileName)))
return fmt.Errorf("metadata: no exif header in %s (search and extract)", txt.Quote(filepath.Base(fileName)))
}
}

4
internal/meta/exif_test.go
View File

@ -219,7 +219,7 @@ func TestExif(t *testing.T) {
t.Fatal("err should NOT be nil")
}
assert.Equal(t, "metadata: no exif header in no-exif-data.jpg", err.Error())
assert.Equal(t, "metadata: no exif header in no-exif-data.jpg (search and extract)", err.Error())
})
t.Run("screenshot.png", func(t *testing.T) {
@ -264,6 +264,6 @@ func TestExif(t *testing.T) {
t.Run("gopher-preview.jpg", func(t *testing.T) {
_, err := Exif("testdata/gopher-preview.jpg")
assert.EqualError(t, err, "metadata: no exif header in gopher-preview.jpg")
assert.EqualError(t, err, "metadata: no exif header in gopher-preview.jpg (search and extract)")
})
}