add config timeout

C0nstantin · C0nstantin · commit 1a993bf9564b · 2021-04-01T18:51:31.000+03:00
diff --git a/ffmpeg/config.go b/ffmpeg/config.go
@@ -1,9 +1,12 @@
 package ffmpeg
 
+import "time"
+
 // Config ...
 type Config struct {
 	FfmpegBinPath   string
 	FfprobeBinPath  string
 	ProgressEnabled bool
 	Verbose         bool
+	Timeout         time.Duration
 }
diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go
@@ -12,9 +12,11 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"syscall"
+	"time"
 
-	"github.com/floostack/transcoder"
-	"github.com/floostack/transcoder/utils"
+	"github.com/C0nstantin/transcoder"
+	"github.com/C0nstantin/transcoder/utils"
 )
 
 // Transcoder ...
@@ -101,16 +103,30 @@ func (t *Transcoder) Start(opts transcoder.Options) (<-chan transcoder.Progress,
 	if err != nil {
 		return nil, fmt.Errorf("Failed starting transcoding (%s) with args (%s) with error %s", t.config.FfmpegBinPath, args, err)
 	}
+	if int(t.config.Timeout) > 0 {
 
-	if t.config.ProgressEnabled && !t.config.Verbose {
-		go func() {
-			t.progress(stderrIn, out)
-		}()
-
+	}
+	if (t.config.ProgressEnabled && !t.config.Verbose) || (int(t.config.Timeout) > 0) {
+		if t.config.ProgressEnabled {
+			go func() {
+				t.progress(stderrIn, out)
+			}()
+		}
+		done := make(chan error, 1)
 		go func() {
 			defer close(out)
-			err = cmd.Wait()
+			done <- cmd.Wait()
+
 		}()
+		select {
+		case <-time.After(t.config.Timeout):
+			cmd.Process.Signal(syscall.SIGTERM)
+		case <-done:
+			if err != nil {
+				return nil, err
+			}
+		}
+
 	} else {
 		err = cmd.Wait()
 	}
@@ -192,7 +208,7 @@ func (t *Transcoder) validate() error {
 }
 
 // GetMetadata Returns metadata for the specified input file
-func (t *Transcoder) GetMetadata() ( transcoder.Metadata, error) {
+func (t *Transcoder) GetMetadata() (transcoder.Metadata, error) {
 
 	if t.config.FfprobeBinPath != "" {
 		var outb, errb bytes.Buffer
diff --git a/ffmpeg/metadata.go b/ffmpeg/metadata.go
@@ -1,6 +1,6 @@
 package ffmpeg
 
-import "github.com/floostack/transcoder"
+import "github.com/C0nstantin/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/C0nstantin/transcoder
 
 go 1.13

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-module github.com/floostack/transcoder`
	`1`	`+module github.com/C0nstantin/transcoder`
`2`	`2`
`3`	`3`	`go 1.13`