Rename FolderConfiguration.Directory to FolderConfiguration.Path

This commit is contained in:
Audrius Butkevicius
2014-09-28 12:56:35 +01:00
parent fdf8ee7015
commit f561d3261a
6 changed files with 30 additions and 30 deletions

View File

@@ -34,7 +34,7 @@ type Configuration struct {
type FolderConfiguration struct {
ID string `xml:"id,attr"`
Directory string `xml:"directory,attr"`
Path string `xml:"path,attr"`
Devices []FolderDeviceConfiguration `xml:"device"`
ReadOnly bool `xml:"ro,attr"`
RescanIntervalS int `xml:"rescanIntervalS,attr" default:"60"`
@@ -306,7 +306,7 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
for i := range cfg.Folders {
folder := &cfg.Folders[i]
if len(folder.Directory) == 0 {
if len(folder.Path) == 0 {
folder.Invalid = "no directory configured"
continue
}

View File

@@ -56,7 +56,7 @@ func TestDeviceConfig(t *testing.T) {
expectedFolders := []FolderConfiguration{
{
ID: "test",
Directory: "~/Sync",
Path: "~/Sync",
Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}},
ReadOnly: true,
RescanIntervalS: 600,