Automatically fix file name normalization errors (fixes #430)

2015-03-22 08:47:34 +01:00
parent a5de1acb46
commit 2bd11ca4e3
4 changed files with 169 additions and 11 deletions
@@ -44,12 +44,14 @@ type Configuration struct {
 }

 type FolderConfiguration struct {
+<<<<<<< HEAD
 	ID              string                      `xml:"id,attr"`
 	Path            string                      `xml:"path,attr"`
 	Devices         []FolderDeviceConfiguration `xml:"device"`
 	ReadOnly        bool                        `xml:"ro,attr"`
 	RescanIntervalS int                         `xml:"rescanIntervalS,attr" default:"60"`
 	IgnorePerms     bool                        `xml:"ignorePerms,attr"`
+	AutoNormalize   bool                        `xml:"autoNormalize,attr" default:"true"`
 	Versioning      VersioningConfiguration     `xml:"versioning"`
 	LenientMtimes   bool                        `xml:"lenientMtimes"`
 	Copiers         int                         `xml:"copiers" default:"1"`  // This defines how many files are handled concurrently.