Remove custom paths and add constants (#216)
This commit is contained in:
@@ -15,15 +15,12 @@ var _default config
|
||||
|
||||
type config struct {
|
||||
ChatDatabaseFilePath string `yaml:"chatDatabaseFile"`
|
||||
DisableWebFeatures bool `yaml:"disableWebFeatures"`
|
||||
EnableDebugFeatures bool `yaml:"-"`
|
||||
FFMpegPath string `yaml:"ffmpegPath"`
|
||||
Files files `yaml:"files"`
|
||||
InstanceDetails InstanceDetails `yaml:"instanceDetails"`
|
||||
PrivateHLSPath string `yaml:"privateHLSPath"`
|
||||
PublicHLSPath string `yaml:"publicHLSPath"`
|
||||
S3 S3 `yaml:"s3"`
|
||||
VersionInfo string `yaml:"-"`
|
||||
VersionInfo string `yaml:"-"` // For storing the version/build number
|
||||
VideoSettings videoSettings `yaml:"videoSettings"`
|
||||
WebServerPort int `yaml:"webServerPort"`
|
||||
YP yp `yaml:"yp"`
|
||||
@@ -158,22 +155,6 @@ func (c *config) GetVideoSegmentSecondsLength() int {
|
||||
return _default.GetVideoSegmentSecondsLength()
|
||||
}
|
||||
|
||||
func (c *config) GetPublicHLSSavePath() string {
|
||||
if c.PublicHLSPath != "" {
|
||||
return c.PublicHLSPath
|
||||
}
|
||||
|
||||
return _default.PublicHLSPath
|
||||
}
|
||||
|
||||
func (c *config) GetPrivateHLSSavePath() string {
|
||||
if c.PrivateHLSPath != "" {
|
||||
return c.PrivateHLSPath
|
||||
}
|
||||
|
||||
return _default.PrivateHLSPath
|
||||
}
|
||||
|
||||
func (c *config) GetPublicWebServerPort() int {
|
||||
if c.WebServerPort != 0 {
|
||||
return c.WebServerPort
|
||||
|
||||
12
config/constants.go
Normal file
12
config/constants.go
Normal file
@@ -0,0 +1,12 @@
|
||||
package config
|
||||
|
||||
import "path/filepath"
|
||||
|
||||
const (
|
||||
WebRoot = "webroot"
|
||||
PrivateHLSStoragePath = "hls"
|
||||
)
|
||||
|
||||
var (
|
||||
PublicHLSStoragePath = filepath.Join(WebRoot, "hls")
|
||||
)
|
||||
@@ -12,8 +12,6 @@ func getDefaults() config {
|
||||
defaults.FFMpegPath = getDefaultFFMpegPath()
|
||||
defaults.VideoSettings.ChunkLengthInSeconds = 4
|
||||
defaults.Files.MaxNumberInPlaylist = 5
|
||||
defaults.PublicHLSPath = "webroot/hls"
|
||||
defaults.PrivateHLSPath = "hls"
|
||||
defaults.VideoSettings.OfflineContent = "static/offline.m4v"
|
||||
defaults.InstanceDetails.ExtraInfoFile = "/static/content.md"
|
||||
defaults.YP.Enabled = false
|
||||
|
||||
Reference in New Issue
Block a user