beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Backend: Adjust log levels and messages

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-07-18 15:40:05 +02:00
parent 28ff51d5cf
commit ff56de1ab2
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/photoprism/convert.go
View file

@ -126,7 +126,7 @@ func (c *Convert) ToJson(mf *MediaFile) (*MediaFile, error) {
fileName := mf.RelName(c.conf.OriginalsPath()) fileName := mf.RelName(c.conf.OriginalsPath())
log.Infof("convert: %s -> %s", fileName, filepath.Base(jsonName)) log.Debugf("convert: %s -> %s", fileName, filepath.Base(jsonName))
cmd := exec.Command(c.conf.ExifToolBin(), "-j", mf.FileName()) cmd := exec.Command(c.conf.ExifToolBin(), "-j", mf.FileName())
@ -223,7 +223,7 @@ func (c *Convert) ToJpeg(image *MediaFile) (*MediaFile, error) {
jpegName = fs.FileName(image.FileName(), c.conf.SidecarPath(), c.conf.OriginalsPath(), fs.JpegExt, c.conf.Settings().Index.Sequences) jpegName = fs.FileName(image.FileName(), c.conf.SidecarPath(), c.conf.OriginalsPath(), fs.JpegExt, c.conf.Settings().Index.Sequences)
fileName := image.RelName(c.conf.OriginalsPath()) fileName := image.RelName(c.conf.OriginalsPath())
log.Infof("convert: %s -> %s", fileName, filepath.Base(jpegName)) log.Debugf("convert: %s -> %s", fileName, filepath.Base(jpegName))
xmpName := fs.TypeXMP.Find(image.FileName(), c.conf.Settings().Index.Sequences) xmpName := fs.TypeXMP.Find(image.FileName(), c.conf.Settings().Index.Sequences)

4
internal/photoprism/import_worker.go
View file

@ -90,7 +90,7 @@ func ImportWorker(jobs <-chan ImportJob) {
log.Errorf("import: %s in %s (convert to jpeg)", err.Error(), txt.Quote(fs.RelName(destinationMainFilename, imp.originalsPath()))) log.Errorf("import: %s in %s (convert to jpeg)", err.Error(), txt.Quote(fs.RelName(destinationMainFilename, imp.originalsPath())))
continue continue
} else { } else {
log.Infof("import: %s created", fs.RelName(jpegFile.FileName(), imp.originalsPath())) log.Debugf("import: %s created", txt.Quote(jpegFile.BaseName()))
} }
} }
@ -107,7 +107,7 @@ func ImportWorker(jobs <-chan ImportJob) {
if jsonFile, err := imp.convert.ToJson(f); err != nil { if jsonFile, err := imp.convert.ToJson(f); err != nil {
log.Errorf("import: %s in %s (create json sidecar)", err.Error(), txt.Quote(f.BaseName())) log.Errorf("import: %s in %s (create json sidecar)", err.Error(), txt.Quote(f.BaseName()))
} else { } else {
log.Infof("import: %s created", fs.RelName(jsonFile.FileName(), imp.originalsPath())) log.Debugf("import: %s created", txt.Quote(jsonFile.BaseName()))
} }
} }

5
internal/photoprism/index_related.go
View file

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"github.com/photoprism/photoprism/internal/query" "github.com/photoprism/photoprism/internal/query"
"github.com/photoprism/photoprism/pkg/fs"
"github.com/photoprism/photoprism/pkg/txt" "github.com/photoprism/photoprism/pkg/txt"
) )
@ -34,7 +33,7 @@ func IndexMain(related *RelatedFiles, ind *Index, opt IndexOptions) (result Inde
return result return result
} else { } else {
log.Infof("index: %s created", fs.RelName(jpegFile.FileName(), ind.originalsPath())) log.Debugf("index: %s created", txt.Quote(jpegFile.BaseName()))
if err := jpegFile.ResampleDefault(ind.thumbPath(), false); err != nil { if err := jpegFile.ResampleDefault(ind.thumbPath(), false); err != nil {
result.Err = fmt.Errorf("index: failed creating thumbnails for %s (%s)", txt.Quote(f.BaseName()), err.Error()) result.Err = fmt.Errorf("index: failed creating thumbnails for %s (%s)", txt.Quote(f.BaseName()), err.Error())
@ -51,7 +50,7 @@ func IndexMain(related *RelatedFiles, ind *Index, opt IndexOptions) (result Inde
if jsonFile, err := ind.convert.ToJson(f); err != nil { if jsonFile, err := ind.convert.ToJson(f); err != nil {
log.Errorf("index: failed creating json sidecar for %s (%s)", txt.Quote(f.BaseName()), err.Error()) log.Errorf("index: failed creating json sidecar for %s (%s)", txt.Quote(f.BaseName()), err.Error())
} else { } else {
log.Infof("index: %s created", fs.RelName(jsonFile.FileName(), ind.originalsPath())) log.Debugf("index: %s created", txt.Quote(jsonFile.BaseName()))
} }
} }