fix crash when running ffmpeg command in current folder

hr3lxphr6j · Jan 5, 2023 · 4fb8825 · 4fb8825
1 parent f5523d5
commit 4fb8825
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/pkg/parser/ffmpeg/ffmpeg.go b/src/pkg/parser/ffmpeg/ffmpeg.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/hr3lxphr6j/bililive-go/src/live"
 	"github.com/hr3lxphr6j/bililive-go/src/pkg/parser"
+	"github.com/hr3lxphr6j/bililive-go/src/pkg/utils"
 )
 
 const (
@@ -119,8 +120,12 @@ func (p *Parser) Status() (map[string]string, error) {
 }
 
 func (p *Parser) ParseLiveStream(url *url.URL, live live.Live, file string) (err error) {
+	ffmpegPath, err := utils.GetFFmpegPath()
+	if err != nil {
+		return err
+	}
 	p.cmd = exec.Command(
-		"ffmpeg",
+		ffmpegPath,
 		"-nostats",
 		"-progress", "-",
 		"-y", "-re",

diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go
@@ -10,12 +10,17 @@ import (
 	"regexp"
 )
 
-func IsFFmpegExist() bool {
-	_, err := exec.LookPath("ffmpeg")
+func GetFFmpegPath() (string, error) {
+	path, err := exec.LookPath("ffmpeg")
 	if errors.Is(err, exec.ErrDot) {
 		// put ffmpeg.exe and binary like bililive-windows-amd64.exe to the same folder is allowed
-		err = nil
+		path, err = exec.LookPath("./ffmpeg")
 	}
+	return path, err
+}
+
+func IsFFmpegExist() bool {
+	_, err := GetFFmpegPath()
 	return err == nil
 }
 

diff --git a/src/recorders/recorder.go b/src/recorders/recorder.go
@@ -142,8 +142,13 @@ func (r *recorder) tryRecode() {
 	r.getLogger().Debugln(r.parser.ParseLiveStream(url, r.Live, fileName))
 	removeEmptyFile(fileName)
 	if r.config.OnRecordFinished.ConvertToMp4 {
+		ffmpegPath, err := utils.GetFFmpegPath()
+		if err != nil {
+			r.getLogger().WithError(err).Error("failed to find ffmpeg")
+			return
+		}
 		convertCmd := exec.Command(
-			"ffmpeg",
+			ffmpegPath,
 			"-hide_banner",
 			"-i",
 			fileName,