perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run go fmt -w

Browse Source
This commit is contained in:
Audrius Butkevicius
2014-09-28 12:05:25 +01:00
parent 6c352dca74
commit 26e4669316
16 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
internal/config/config.go
View File

@@ -23,24 +23,24 @@ import (
var l = logger.DefaultLogger
type Configuration struct {
Location string `xml:"-" json:"-"`
Version int `xml:"version,attr" default:"3"`
Folders []FolderConfiguration `xml:"folder"`
Devices []DeviceConfiguration `xml:"device"`
GUI GUIConfiguration `xml:"gui"`
Options OptionsConfiguration `xml:"options"`
XMLName xml.Name `xml:"configuration" json:"-"`
Location string `xml:"-" json:"-"`
Version int `xml:"version,attr" default:"3"`
Folders []FolderConfiguration `xml:"folder"`
Devices []DeviceConfiguration `xml:"device"`
GUI GUIConfiguration `xml:"gui"`
Options OptionsConfiguration `xml:"options"`
XMLName xml.Name `xml:"configuration" json:"-"`
}
type FolderConfiguration struct {
ID string `xml:"id,attr"`
Directory string `xml:"directory,attr"`
Devices []FolderDeviceConfiguration `xml:"device"`
ReadOnly bool `xml:"ro,attr"`
RescanIntervalS int `xml:"rescanIntervalS,attr" default:"60"`
IgnorePerms bool `xml:"ignorePerms,attr"`
Invalid string `xml:"-"` // Set at runtime when there is an error, not saved
Versioning VersioningConfiguration `xml:"versioning"`
ID string `xml:"id,attr"`
Directory string `xml:"directory,attr"`
Devices []FolderDeviceConfiguration `xml:"device"`
ReadOnly bool `xml:"ro,attr"`
RescanIntervalS int `xml:"rescanIntervalS,attr" default:"60"`
IgnorePerms bool `xml:"ignorePerms,attr"`
Invalid string `xml:"-"` // Set at runtime when there is an error, not saved
Versioning VersioningConfiguration `xml:"versioning"`
deviceIDs []protocol.DeviceID
}
@@ -96,12 +96,12 @@ func (r *FolderConfiguration) DeviceIDs() []protocol.DeviceID {
}
type DeviceConfiguration struct {
DeviceID protocol.DeviceID `xml:"id,attr"`
Name string `xml:"name,attr,omitempty"`
Addresses []string `xml:"address,omitempty"`
Compression bool `xml:"compression,attr"`
CertName string `xml:"certName,attr,omitempty"`
Introducer bool `xml:"introducer,attr"`
DeviceID protocol.DeviceID `xml:"id,attr"`
Name string `xml:"name,attr,omitempty"`
Addresses []string `xml:"address,omitempty"`
Compression bool `xml:"compression,attr"`
CertName string `xml:"certName,attr,omitempty"`
Introducer bool `xml:"introducer,attr"`
}
type FolderDeviceConfiguration struct {
@@ -375,7 +375,7 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
myName, _ := os.Hostname()
cfg.Devices = append(cfg.Devices, DeviceConfiguration{
DeviceID: myID,
Name: myName,
Name: myName,
})
}
sort.Sort(DeviceConfigurationList(cfg.Devices))
@@ -527,7 +527,7 @@ func convertV1V2(cfg *Configuration) {
// Set and sort the list of devices.
for _, device := range devices {
cfg.Devices = append(cfg.Devices, DeviceConfiguration{
DeviceID: device.DeviceID,
DeviceID: device.DeviceID,
Name: device.Deprecated_Name,
Addresses: device.Deprecated_Addresses,
})

22
internal/config/config_test.go
View File

@@ -57,20 +57,20 @@ func TestDeviceConfig(t *testing.T) {
{
ID: "test",
Directory: "~/Sync",
Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}},
Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}},
ReadOnly: true,
RescanIntervalS: 600,
},
}
expectedDevices := []DeviceConfiguration{
{
DeviceID: device1,
DeviceID: device1,
Name: "device one",
Addresses: []string{"a"},
Compression: true,
},
{
DeviceID: device4,
DeviceID: device4,
Name: "device two",
Addresses: []string{"b"},
Compression: true,
@@ -144,22 +144,22 @@ func TestDeviceAddressesDynamic(t *testing.T) {
name, _ := os.Hostname()
expected := []DeviceConfiguration{
{
DeviceID: device1,
DeviceID: device1,
Addresses: []string{"dynamic"},
Compression: true,
},
{
DeviceID: device2,
DeviceID: device2,
Addresses: []string{"dynamic"},
Compression: true,
},
{
DeviceID: device3,
DeviceID: device3,
Addresses: []string{"dynamic"},
Compression: true,
},
{
DeviceID: device4,
DeviceID: device4,
Name: name, // Set when auto created
Addresses: []string{"dynamic"},
},
@@ -179,19 +179,19 @@ func TestDeviceAddressesStatic(t *testing.T) {
name, _ := os.Hostname()
expected := []DeviceConfiguration{
{
DeviceID: device1,
DeviceID: device1,
Addresses: []string{"192.0.2.1", "192.0.2.2"},
},
{
DeviceID: device2,
DeviceID: device2,
Addresses: []string{"192.0.2.3:6070", "[2001:db8::42]:4242"},
},
{
DeviceID: device3,
DeviceID: device3,
Addresses: []string{"[2001:db8::44]:4444", "192.0.2.4:6090"},
},
{
DeviceID: device4,
DeviceID: device4,
Name: name, // Set when auto created
Addresses: []string{"dynamic"},
},