New Expandable file formats ()

This commit is contained in:
Antonio Navarro Perez 2021-11-29 11:07:54 +01:00 committed by GitHub
parent 15c72452de
commit 8d9a9281c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 808 additions and 346 deletions

View file

@ -31,6 +31,7 @@ func DefaultConfig() *Root {
GlobalCacheSize: 2048,
MetadataFolder: metadataFolder,
AddTimeout: 60,
ReadTimeout: 120,
},
Fuse: &FuseGlobal{
AllowOther: false,

View file

@ -34,8 +34,20 @@ func TestDefaults(t *testing.T) {
r := &Root{}
dr := AddDefaults(r)
require.NotNil(dr)
require.NotNil(dr.Fuse)
// FUSE can be deactivated
require.Nil(dr.Fuse)
require.NotNil(dr.HTTPGlobal)
require.NotNil(dr.Log)
require.NotNil(dr.Torrent)
// Add defaults when fuse is set
r = &Root{
Fuse: &FuseGlobal{},
}
dr = AddDefaults(r)
require.NotNil(dr.Fuse)
require.Equal(mountFolder, dr.Fuse.Path)
}

View file

@ -21,6 +21,7 @@ type Log struct {
}
type TorrentGlobal struct {
ReadTimeout int `yaml:"read_timeout,omitempty"`
AddTimeout int `yaml:"add_timeout,omitempty"`
GlobalCacheSize int64 `yaml:"global_cache_size,omitempty"`
MetadataFolder string `yaml:"metadata_folder,omitempty"`
@ -70,6 +71,10 @@ func AddDefaults(r *Root) *Root {
r.Torrent.AddTimeout = 60
}
if r.Torrent.ReadTimeout == 0 {
r.Torrent.ReadTimeout = 120
}
if r.Torrent.GlobalCacheSize == 0 {
r.Torrent.GlobalCacheSize = 2048 // 2GB
}
@ -78,11 +83,10 @@ func AddDefaults(r *Root) *Root {
r.Torrent.MetadataFolder = metadataFolder
}
if r.Fuse == nil {
r.Fuse = &FuseGlobal{}
}
if r.Fuse.Path == "" {
r.Fuse.Path = mountFolder
if r.Fuse != nil {
if r.Fuse.Path == "" {
r.Fuse.Path = mountFolder
}
}
if r.HTTPGlobal == nil {