From 10aa917c24a1e4565416bf3de65477dca7d47778 Mon Sep 17 00:00:00 2001 From: Leonid Nikitin Date: Tue, 16 Jan 2024 18:08:50 +0600 Subject: [PATCH] I made it so that an error would be displayed if ffmpeg was not found. --- src/convertor/service.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/convertor/service.go b/src/convertor/service.go index 424b0a4..5d395b1 100644 --- a/src/convertor/service.go +++ b/src/convertor/service.go @@ -53,7 +53,10 @@ func (s Service) RunConvert(setting ConvertSetting) error { out, err := cmd.CombinedOutput() if err != nil { errStringArr := regexp.MustCompile("\r?\n").Split(strings.TrimSpace(string(out)), -1) - return errors.New(errStringArr[len(errStringArr)-1]) + if len(errStringArr) > 1 { + return errors.New(errStringArr[len(errStringArr)-1]) + } + return err } return nil @@ -64,7 +67,11 @@ func (s Service) GetTotalDuration(file *File) (duration float64, err error) { cmd := exec.Command(s.pathFFprobe, args...) out, err := cmd.CombinedOutput() if err != nil { - return 0, errors.New(strings.TrimSpace(string(out))) + errString := strings.TrimSpace(string(out)) + if len(errString) > 1 { + return 0, errors.New(errString) + } + return 0, err } return strconv.ParseFloat(strings.TrimSpace(string(out)), 64) }