From 176189c9d08c7ef03bf8482cc64348a7f561a49c Mon Sep 17 00:00:00 2001
From: Leonid Nikitin <i@kor-elf.net>
Date: Tue, 16 Jan 2024 00:04:50 +0600
Subject: [PATCH] Adjusted display of error text when an error occurs during
 video conversion.

---
 src/convertor/service.go | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/convertor/service.go b/src/convertor/service.go
index ea6bdf4..41c05cb 100644
--- a/src/convertor/service.go
+++ b/src/convertor/service.go
@@ -3,6 +3,7 @@ package convertor
 import (
 	"errors"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -46,23 +47,12 @@ func (s Service) RunConvert(setting ConvertSetting) error {
 	//args := "-report -n -i " + setting.VideoFileInput.Path + " -c:v libx264 -progress unix://" + setting.SocketPath + " output-file.mp4"
 	//args := "-n -i " + setting.VideoFileInput.Path + " -c:v libx264 -progress unix://" + setting.SocketPath + " output-file.mp4"
 	args := "-y -i " + setting.VideoFileInput.Path + " -c:v libx264 -progress unix://" + setting.SocketPath + " output-file.mp4"
-	cmd := exec.Command("ffmpeg", strings.Split(args, " ")...)
+	cmd := exec.Command(s.pathFFmpeg, strings.Split(args, " ")...)
 
-	//stderr, _ := cmd.StdoutPipe()
-	err := cmd.Start()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return err
-	}
-
-	//scanner := bufio.NewScanner(stderr)
-	////scanner.Split(bufio.ScanWords)
-	//for scanner.Scan() {
-	//	m := scanner.Text()
-	//	fmt.Println(m)
-	//}
-	err = cmd.Wait()
-	if err != nil {
-		return err
+		errStringArr := regexp.MustCompile("\r?\n").Split(strings.TrimSpace(string(out)), -1)
+		return errors.New(errStringArr[len(errStringArr)-1])
 	}
 
 	return nil