add *os.Process in return values

xucai.hong · xucai.hong · commit 73269cc6bfd4 · 2021-09-09T09:59:29.000+08:00
diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go
@@ -14,8 +14,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/floostack/transcoder"
-	"github.com/floostack/transcoder/utils"
+	"github.com/wolfhong/transcoder"
+	"github.com/wolfhong/transcoder/utils"
 )
 
 // Transcoder ...
@@ -38,7 +38,7 @@ func New(cfg *Config) transcoder.Transcoder {
 }
 
 // Start ...
-func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress, error) {
+func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress, *os.Process, error) {
 
 	var stderrIn io.ReadCloser
 
@@ -48,13 +48,13 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,
 
 	// Validates config
 	if err := t.validate(); err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// Get file metadata
 	_, err := t.GetMetadata()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// Append input file and standard options
@@ -98,7 +98,7 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,
 	if t.config.ProgressEnabled && !t.config.Verbose {
 		stderrIn, err = cmd.StderrPipe()
 		if err != nil {
-			return nil, fmt.Errorf("Failed getting transcoding progress (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)
+			return nil, nil, fmt.Errorf("Failed getting transcoding progress (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)
 		}
 	}
 
@@ -109,7 +109,7 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,
 	// Start process
 	err = cmd.Start()
 	if err != nil {
-		return nil, fmt.Errorf("Failed starting transcoding (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)
+		return nil, nil, fmt.Errorf("Failed starting transcoding (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)
 	}
 
 	if t.config.ProgressEnabled && !t.config.Verbose {
@@ -125,7 +125,7 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,
 		err = cmd.Wait()
 	}
 
-	return out, nil
+	return out, cmd.Process, nil
 }
 
 // Input ...
diff --git a/ffmpeg/metadata.go b/ffmpeg/metadata.go
@@ -1,6 +1,6 @@
 package ffmpeg
 
-import "github.com/floostack/transcoder"
+import "github.com/wolfhong/transcoder"
 
 // Metadata ...
 type Metadata struct {
diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
-module github.com/floostack/transcoder
+module github.com/wolfhong/transcoder
 
 go 1.13
diff --git a/transcoder.go b/transcoder.go
@@ -3,11 +3,12 @@ package transcoder
 import (
 	"context"
 	"io"
+	"os"
 )
 
 // Transcoder ...
 type Transcoder interface {
-	Start(opts Options) (<-chan Progress, error)
+	Start(opts Options) (<-chan Progress, *os.Process, error)
 	Input(i string) Transcoder
 	InputPipe(w *io.WriteCloser, r *io.ReadCloser) Transcoder
 	Output(o string) Transcoder

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ import (`
`14`	`14`	`"strconv"`
`15`	`15`	`"strings"`
`16`	`16`
`17`		`- "github.com/floostack/transcoder"`
`18`		`- "github.com/floostack/transcoder/utils"`
	`17`	`+ "github.com/wolfhong/transcoder"`
	`18`	`+ "github.com/wolfhong/transcoder/utils"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// Transcoder ...`
`@@ -38,7 +38,7 @@ func New(cfg *Config) transcoder.Transcoder {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Start ...`
`41`		`-func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress, error) {`
	`41`	`+func (t Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress, os.Process, error) {`
`42`	`42`
`43`	`43`	`var stderrIn io.ReadCloser`
`44`	`44`
`@@ -48,13 +48,13 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,`
`48`	`48`
`49`	`49`	`// Validates config`
`50`	`50`	`if err := t.validate(); err != nil {`
`51`		`- return nil, err`
	`51`	`+ return nil, nil, err`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// Get file metadata`
`55`	`55`	`_, err := t.GetMetadata()`
`56`	`56`	`if err != nil {`
`57`		`- return nil, err`
	`57`	`+ return nil, nil, err`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// Append input file and standard options`
`@@ -98,7 +98,7 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,`
`98`	`98`	`if t.config.ProgressEnabled && !t.config.Verbose {`
`99`	`99`	`stderrIn, err = cmd.StderrPipe()`
`100`	`100`	`if err != nil {`
`101`		`- return nil, fmt.Errorf("Failed getting transcoding progress (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)`
	`101`	`+ return nil, nil, fmt.Errorf("Failed getting transcoding progress (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`@@ -109,7 +109,7 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,`
`109`	`109`	`// Start process`
`110`	`110`	`err = cmd.Start()`
`111`	`111`	`if err != nil {`
`112`		`- return nil, fmt.Errorf("Failed starting transcoding (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)`
	`112`	`+ return nil, nil, fmt.Errorf("Failed starting transcoding (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if t.config.ProgressEnabled && !t.config.Verbose {`
`@@ -125,7 +125,7 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,`
`125`	`125`	`err = cmd.Wait()`
`126`	`126`	`}`
`127`	`127`
`128`		`- return out, nil`
	`128`	`+ return out, cmd.Process, nil`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// Input ...`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-module github.com/floostack/transcoder`
	`1`	`+module github.com/wolfhong/transcoder`
`2`	`2`
`3`	`3`	`go 1.13`