mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 13:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactor: clean up unused config options

Browse source
This commit is contained in:
Deluan 2020-03-17 15:16:50 -04:00 • committed by Deluan Quintão
parent 68a49befc8
commit e02f3d3ec9
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
conf/configuration.go
View file

@ -23,11 +23,8 @@ type nd struct {
IgnoredArticles string `default:"The El La Los Las Le Les Os As O A"` IgnoredArticles string `default:"The El La Los Las Le Les Os As O A"`
IndexGroups string `default:"A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)"` IndexGroups string `default:"A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)"`
EnableDownsampling bool `default:"false"` TranscodingCacheSize int64 `default:"100"` // in MB
MaxBitRate int `default:"0"` ProbeCommand string `default:"ffmpeg -i %s -f ffmetadata"`
MaxTranscodingCacheSize int64 `default:"100"` // in MB
DownsampleCommand string `default:"ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -"`
ProbeCommand string `default:"ffmpeg -i %s -f ffmetadata"`
// DevFlags. These are used to enable/disable debugging and incomplete features // DevFlags. These are used to enable/disable debugging and incomplete features
DevDisableBanner bool `default:"false"` DevDisableBanner bool `default:"false"`

2
engine/media_streamer.go
View file

@ -198,7 +198,7 @@ func getFinalCachedSize(r fscache.ReadAtCloser) int64 {
} }
func NewTranscodingCache() (fscache.Cache, error) { func NewTranscodingCache() (fscache.Cache, error) {
lru := fscache.NewLRUHaunter(0, conf.Server.MaxTranscodingCacheSize*1024*1024, 10*time.Minute) lru := fscache.NewLRUHaunter(0, conf.Server.TranscodingCacheSize*1024*1024, 10*time.Minute)
h := fscache.NewLRUHaunterStrategy(lru) h := fscache.NewLRUHaunterStrategy(lru)
cacheFolder := filepath.Join(conf.Server.DataFolder, consts.CacheDir) cacheFolder := filepath.Join(conf.Server.DataFolder, consts.CacheDir)
fs, err := fscache.NewFs(cacheFolder, 0755) fs, err := fscache.NewFs(cacheFolder, 0755)

2
engine/media_streamer_test.go
View file

@ -7,7 +7,6 @@ import (
"os" "os"
"strings" "strings"
"github.com/deluan/navidrome/conf"
"github.com/deluan/navidrome/log" "github.com/deluan/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/deluan/navidrome/model"
"github.com/deluan/navidrome/persistence" "github.com/deluan/navidrome/persistence"
@ -31,7 +30,6 @@ var _ = Describe("MediaStreamer", func() {
}) })
BeforeEach(func() { BeforeEach(func() {
conf.Server.EnableDownsampling = true
ds = &persistence.MockDataStore{MockedTranscoding: &mockTranscodingRepository{}} ds = &persistence.MockDataStore{MockedTranscoding: &mockTranscodingRepository{}}
ds.MediaFile(ctx).(*persistence.MockMediaFile).SetData(`[{"id": "123", "path": "tests/fixtures/test.mp3", "suffix": "mp3", "bitRate": 128, "duration": 257.0}]`, 1) ds.MediaFile(ctx).(*persistence.MockMediaFile).SetData(`[{"id": "123", "path": "tests/fixtures/test.mp3", "suffix": "mp3", "bitRate": 128, "duration": 257.0}]`, 1)
streamer = NewMediaStreamer(ds, ffmpeg, cache) streamer = NewMediaStreamer(ds, ffmpeg, cache)