From 064fdda528a97746c163e5fe3db389cf51b8c36a Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Thu, 7 Jan 2021 22:45:29 -0800 Subject: [PATCH] Check version of ffmpeg. Closes #587 --- config/config.go | 4 +++- config/verifyInstall.go | 21 +++++++++++++++++++++ go.mod | 1 + go.sum | 8 ++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/config/config.go b/config/config.go index a2a76368d..01f3f11f7 100644 --- a/config/config.go +++ b/config/config.go @@ -215,7 +215,9 @@ func (c *config) GetFFMpegPath() string { } path := strings.TrimSpace(string(out)) - + if err := verifyFFMpegPath(path); err != nil { + log.Warnln(err) + } return path } diff --git a/config/verifyInstall.go b/config/verifyInstall.go index 74d429c00..3e4932432 100644 --- a/config/verifyInstall.go +++ b/config/verifyInstall.go @@ -4,6 +4,10 @@ import ( "errors" "fmt" "os" + "os/exec" + "strings" + + "golang.org/x/mod/semver" ) // verifyFFMpegPath verifies that the path exists, is a file, and is executable. @@ -28,5 +32,22 @@ func verifyFFMpegPath(path string) error { return errors.New("ffmpeg path is not executable") } + suggestedVersion := "v4.1.5" + cmd := exec.Command(path) + out, err := cmd.CombinedOutput() + + response := string(out) + if response == "" { + fmt.Println(err) + return fmt.Errorf("unable to determine the version of your ffmpeg installation at %s. you may experience issues with video.", path) + } + + responseComponents := strings.Split(response, " ") + fullVersionString := responseComponents[2] + versionString := "v" + strings.Split(fullVersionString, "-")[0] + if !semver.IsValid(versionString) || semver.Compare(versionString, suggestedVersion) == -1 { + return fmt.Errorf("your %s version of ffmpeg at %s may be older than the suggested version of %s. you may experience issues with video.", versionString, path, suggestedVersion) + } + return nil } diff --git a/go.mod b/go.mod index 1f92af620..d3107d93b 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/sirupsen/logrus v1.7.0 github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf github.com/yuin/goldmark v1.3.1 + golang.org/x/mod v0.4.0 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect diff --git a/go.sum b/go.sum index bf7046c21..436c69874 100644 --- a/go.sum +++ b/go.sum @@ -64,12 +64,17 @@ github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf/go.mod h1:M8agBzg github.com/yuin/goldmark v1.3.1 h1:eVwehsLsZlCJCwXyGLgg+Q4iFWE/eTIMG0e8waCmm/I= github.com/yuin/goldmark v1.3.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -82,6 +87,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=