From 8727285bc504f18c0b32b1ee1626b625a587622e Mon Sep 17 00:00:00 2001 From: James Mills Date: Thu, 26 Mar 2020 14:34:19 +1000 Subject: Refactored thumbnail generation with configurable timeout and in-sycn with video transcoding --- media/video.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'media') diff --git a/media/video.go b/media/video.go index 0b44b6b..2cad297 100644 --- a/media/video.go +++ b/media/video.go @@ -9,9 +9,7 @@ import ( "strings" "time" - "github.com/apex/log" "github.com/dhowden/tag" - "github.com/wybiral/tube/utils" ) @@ -80,21 +78,16 @@ func ParseVideo(p *Path, name string) (*Video, error) { if pic != nil { v.Thumb = pic.Data v.ThumbType = pic.MIMEType - } else if utils.CmdExists("mt") { + } else { thumbFn := fmt.Sprintf("%s.jpg", strings.TrimSuffix(pth, filepath.Ext(pth))) - if !utils.FileExists(thumbFn) { - if err := utils.RunCmd(30, "mt", "-b", "-s", "-n", "1", pth); err != nil { - err := fmt.Errorf("error generating thumbnail: %w", err) - log.Error(err.Error()) + if utils.FileExists(thumbFn) { + data, err := ioutil.ReadFile(fmt.Sprintf("%s.jpg", strings.TrimSuffix(pth, filepath.Ext(pth)))) + if err != nil { return nil, err } + v.Thumb = data + v.ThumbType = "image/jpeg" } - data, err := ioutil.ReadFile(fmt.Sprintf("%s.jpg", strings.TrimSuffix(pth, filepath.Ext(pth)))) - if err != nil { - return nil, err - } - v.Thumb = data - v.ThumbType = "image/jpeg" } return v, nil -- cgit v1.2.3