update go-fftool

Author: godcong

config.go

@@ -52,7 +52,7 @@ type Config struct {
 	processID       string
 	crypto          *Crypto
 	output          string
-	LogOutput       chan string
+	LogOutput       bool
 	VideoFormat     string
 	AudioFormat     string
 	Scale           Scale

ffmpeg.go

@@ -6,6 +6,7 @@ import (
 	"github.com/goextension/log"
 	"github.com/google/uuid"
 	"os"
+	"strings"
 	"sync"
 )
 
@@ -23,7 +24,7 @@ type MpegOption struct {
 }
 
 // RunOptions ...
-type RunOptions func(cfg *Config)
+type RunOptions func(cfg *Config) *Config
 
 // Name ...
 func (ff FFMpeg) Name() string {
@@ -42,7 +43,7 @@ func (ff FFMpeg) Run(ctx context.Context, input string, opts ...RunOptions) (e e
 
 	config.processID = pid
 	for _, opt := range opts {
-		opt(config)
+		config = opt(config)
 	}
 	if config.processID == "" {
 		config.processID = pid
@@ -66,12 +67,28 @@ func (ff FFMpeg) Run(ctx context.Context, input string, opts ...RunOptions) (e e
 	}
 	args := outputArgs(config, input)
 
+	var outLog chan string
+	if config.LogOutput {
+		outLog = make(chan string)
+	}
+
+	log.Infow("runmsg", "init", outLog == nil)
+
 	wg := &sync.WaitGroup{}
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		e = ff.cmd.RunContext(ctx, args, config.LogOutput)
+		e = ff.cmd.RunContext(ctx, args, outLog)
 	}()
+
+	if config.LogOutput {
+		for i2 := range outLog {
+			ss := strings.Split(i2, "\r")
+			for _, i3 := range ss {
+				log.Infow("runmsg", "outLog", strings.TrimSpace(i3))
+			}
+		}
+	}
 	wg.Wait()
 	return e
 }

ffmpeg_test.go

@@ -98,8 +98,9 @@ func TestFFMpeg_Run(t *testing.T) {
 				t.Errorf("OptimizeWithFormat() error = %v, wantErr %v", e, tt.wantErr)
 				return
 			}
-			if err := ff.Run(tt.args.ctx, tt.args.input, func(config *Config) {
-				config = cfg
+			cfg.LogOutput = true
+			if err := ff.Run(tt.args.ctx, tt.args.input, func(config *Config) *Config {
+				return cfg
 			}); (err != nil) != tt.wantErr {
 				t.Errorf("Run() error = %v, wantErr %v", err, tt.wantErr)
 			}