octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 03:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

AlwaysLocalNets should not default to null

Browse Source
This commit is contained in:
Jakob Borg 2015-10-27 12:04:51 +01:00
parent 679f0f9363
commit d171173e90
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/config/config.go
View File

@ -56,6 +56,34 @@ var (
} }
) )
func New(myID protocol.DeviceID) Configuration {
var cfg Configuration
cfg.Version = CurrentVersion
cfg.OriginalVersion = CurrentVersion
setDefaults(&cfg)
setDefaults(&cfg.Options)
setDefaults(&cfg.GUI)
cfg.prepare(myID)
return cfg
}
func ReadXML(r io.Reader, myID protocol.DeviceID) (Configuration, error) {
var cfg Configuration
setDefaults(&cfg)
setDefaults(&cfg.Options)
setDefaults(&cfg.GUI)
err := xml.NewDecoder(r).Decode(&cfg)
cfg.OriginalVersion = cfg.Version
cfg.prepare(myID)
return cfg, err
}
type Configuration struct { type Configuration struct {
Version int `xml:"version,attr" json:"version"` Version int `xml:"version,attr" json:"version"`
Folders []FolderConfiguration `xml:"folder" json:"folders"` Folders []FolderConfiguration `xml:"folder" json:"folders"`
@ -92,34 +120,6 @@ func (cfg Configuration) Copy() Configuration {
return newCfg return newCfg
} }
func New(myID protocol.DeviceID) Configuration {
var cfg Configuration
cfg.Version = CurrentVersion
cfg.OriginalVersion = CurrentVersion
setDefaults(&cfg)
setDefaults(&cfg.Options)
setDefaults(&cfg.GUI)
cfg.prepare(myID)
return cfg
}
func ReadXML(r io.Reader, myID protocol.DeviceID) (Configuration, error) {
var cfg Configuration
setDefaults(&cfg)
setDefaults(&cfg.Options)
setDefaults(&cfg.GUI)
err := xml.NewDecoder(r).Decode(&cfg)
cfg.OriginalVersion = cfg.Version
cfg.prepare(myID)
return cfg, err
}
func (cfg *Configuration) WriteXML(w io.Writer) error { func (cfg *Configuration) WriteXML(w io.Writer) error {
e := xml.NewEncoder(w) e := xml.NewEncoder(w)
e.Indent("", " ") e.Indent("", " ")
@ -141,6 +141,9 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
if cfg.IgnoredDevices == nil { if cfg.IgnoredDevices == nil {
cfg.IgnoredDevices = []protocol.DeviceID{} cfg.IgnoredDevices = []protocol.DeviceID{}
} }
if cfg.Options.AlwaysLocalNets == nil {
cfg.Options.AlwaysLocalNets = []string{}
}
// Check for missing, bad or duplicate folder ID:s // Check for missing, bad or duplicate folder ID:s
var seenFolders = map[string]*FolderConfiguration{} var seenFolders = map[string]*FolderConfiguration{}

2
lib/config/config_test.go
View File

@ -62,6 +62,7 @@ func TestDefaultValues(t *testing.T) {
URInitialDelayS: 1800, URInitialDelayS: 1800,
URPostInsecurely: false, URPostInsecurely: false,
ReleasesURL: "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30", ReleasesURL: "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30",
AlwaysLocalNets: []string{},
} }
cfg := New(device1) cfg := New(device1)
@ -185,6 +186,7 @@ func TestOverriddenValues(t *testing.T) {
URInitialDelayS: 800, URInitialDelayS: 800,
URPostInsecurely: true, URPostInsecurely: true,
ReleasesURL: "https://localhost/releases", ReleasesURL: "https://localhost/releases",
AlwaysLocalNets: []string{},
} }
cfg, err := Load("testdata/overridenvalues.xml", device1) cfg, err := Load("testdata/overridenvalues.xml", device1)