diff --git a/internal/photoprism/convert_video_avc.go b/internal/photoprism/convert_video_avc.go index dd5bc54b3..40aa159d9 100644 --- a/internal/photoprism/convert_video_avc.go +++ b/internal/photoprism/convert_video_avc.go @@ -46,7 +46,7 @@ func (w *Convert) ToAvc(f *MediaFile, encoder encode.Encoder, noMutex, force boo if mp4Name, mp4Err := fs.FileName(f.FileName(), w.conf.SidecarPath(), w.conf.OriginalsPath(), fs.ExtMp4); mp4Err != nil { return nil, fmt.Errorf("convert: %s in %s (remux)", mp4Err, clean.Log(f.RootRelName())) } else if mp4Err = ffmpeg.RemuxFile(f.FileName(), mp4Name, encode.NewRemuxOptions(conf.FFmpegBin(), fs.VideoMp4, false)); mp4Err != nil { - return nil, fmt.Errorf("convert: %s in %s (remux)", err, clean.Log(f.RootRelName())) + return nil, fmt.Errorf("convert: %s in %s (remux)", mp4Err, clean.Log(f.RootRelName())) } else if mp4File, fileErr := NewMediaFile(mp4Name); mp4File == nil || fileErr != nil { log.Warnf("convert: %s could not be converted to mp4", logFileName) } else if jsonErr := mp4File.CreateExifToolJson(w); jsonErr != nil { diff --git a/internal/photoprism/mediafile_vision.go b/internal/photoprism/mediafile_vision.go index 1ca330f14..4f487cdb4 100644 --- a/internal/photoprism/mediafile_vision.go +++ b/internal/photoprism/mediafile_vision.go @@ -38,7 +38,7 @@ func (m *MediaFile) GenerateCaption(captionSrc entity.Src) (caption *vision.Capt fileName, fileErr := m.Thumbnail(Config().ThumbCachePath(), size.Name) if fileErr != nil { - return caption, err + return caption, fileErr } // Get matching labels from computer vision model. @@ -101,7 +101,7 @@ func (m *MediaFile) GenerateLabels(labelSrc entity.Src) (labels classify.Labels) // Get thumbnail filenames for the selected sizes. for _, s := range sizes { if thumbnail, fileErr := m.Thumbnail(Config().ThumbCachePath(), s); fileErr != nil { - log.Debugf("index: %s in %s", err, clean.Log(m.RootRelName())) + log.Debugf("index: %s in %s", fileErr, clean.Log(m.RootRelName())) continue } else { thumbnails = append(thumbnails, thumbnail)