Browse Source

Do not perform ffmpeg location logic in defaults

pull/333/head
Gabe Kangas 5 years ago
parent
commit
73ec2126cc
  1. 20
      config/config.go
  2. 26
      config/defaults.go

20
config/config.go

@ -3,6 +3,8 @@ package config @@ -3,6 +3,8 @@ package config
import (
"errors"
"io/ioutil"
"os/exec"
"strings"
"github.com/owncast/owncast/utils"
log "github.com/sirupsen/logrus"
@ -184,7 +186,23 @@ func (c *config) GetFFMpegPath() string { @@ -184,7 +186,23 @@ func (c *config) GetFFMpegPath() string {
return c.FFMpegPath
}
return _default.FFMpegPath
// First look to see if ffmpeg is in the current working directory
localCopy := "./ffmpeg"
hasLocalCopyError := verifyFFMpegPath(localCopy)
if hasLocalCopyError == nil {
// No error, so all is good. Use the local copy.
return localCopy
}
cmd := exec.Command("which", "ffmpeg")
out, err := cmd.CombinedOutput()
if err != nil {
log.Debugln("Unable to determine path to ffmpeg. Please specify it in the config file.")
}
path := strings.TrimSpace(string(out))
return path
}
func (c *config) GetYPServiceHost() string {

26
config/defaults.go

@ -1,14 +1,8 @@ @@ -1,14 +1,8 @@
package config
import (
"os/exec"
"strings"
)
func getDefaults() config {
defaults := config{}
defaults.WebServerPort = 8080
defaults.FFMpegPath = getDefaultFFMpegPath()
defaults.VideoSettings.ChunkLengthInSeconds = 4
defaults.Files.MaxNumberInPlaylist = 5
defaults.YP.Enabled = false
@ -25,23 +19,3 @@ func getDefaults() config { @@ -25,23 +19,3 @@ func getDefaults() config {
return defaults
}
func getDefaultFFMpegPath() string {
// First look to see if ffmpeg is in the current working directory
localCopy := "./ffmpeg"
hasLocalCopyError := verifyFFMpegPath(localCopy)
if hasLocalCopyError == nil {
// No error, so all is good. Use the local copy.
return localCopy
}
cmd := exec.Command("which", "ffmpeg")
out, err := cmd.CombinedOutput()
if err != nil {
panic("Unable to determine path to ffmpeg. Please specify it in the config file.")
}
path := strings.TrimSpace(string(out))
return path
}

Loading…
Cancel
Save