Mirrors/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2026-01-22 18:18:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix error handling in mediafile_vision.go and convert_video_avc.go #5398

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2025-12-29 09:36:47 +01:00
parent 8296708037
commit 82c5989b30
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/photoprism/convert_video_avc.go
View file

@ -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 {

4
internal/photoprism/mediafile_vision.go
View file

@ -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)