octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 03:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

DisableSymlinks -> !SymlinksEnabled

Browse Source
This commit is contained in:
Jakob Borg 2014-12-01 11:26:54 +01:00
parent 8a34158fa4
commit e7441ff6e8
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/main.go
View File

@ -458,7 +458,7 @@ func syncthingMain() {
opts := cfg.Options() opts := cfg.Options()
if opts.DisableSymlinks { if !opts.SymlinksEnabled {
symlinks.Supported = false symlinks.Supported = false
} }

2
internal/config/config.go
View File

@ -179,7 +179,7 @@ type OptionsConfiguration struct {
KeepTemporariesH int `xml:"keepTemporariesH" default:"24"` // 0 for off KeepTemporariesH int `xml:"keepTemporariesH" default:"24"` // 0 for off
CacheIgnoredFiles bool `xml:"cacheIgnoredFiles" default:"true"` CacheIgnoredFiles bool `xml:"cacheIgnoredFiles" default:"true"`
ProgressUpdateIntervalS int `xml:"progressUpdateIntervalS" default:"5"` ProgressUpdateIntervalS int `xml:"progressUpdateIntervalS" default:"5"`
DisableSymlinks bool `xml:"disableSymlinks" default:"false"` SymlinksEnabled bool `xml:"symlinksEnabled" default:"true"`
Deprecated_RescanIntervalS int `xml:"rescanIntervalS,omitempty" json:"-"` Deprecated_RescanIntervalS int `xml:"rescanIntervalS,omitempty" json:"-"`
Deprecated_UREnabled bool `xml:"urEnabled,omitempty" json:"-"` Deprecated_UREnabled bool `xml:"urEnabled,omitempty" json:"-"`

4
internal/config/config_test.go
View File

@ -53,7 +53,7 @@ func TestDefaultValues(t *testing.T) {
KeepTemporariesH: 24, KeepTemporariesH: 24,
CacheIgnoredFiles: true, CacheIgnoredFiles: true,
ProgressUpdateIntervalS: 5, ProgressUpdateIntervalS: 5,
DisableSymlinks: false, SymlinksEnabled: true,
} }
cfg := New(device1) cfg := New(device1)
@ -156,7 +156,7 @@ func TestOverriddenValues(t *testing.T) {
KeepTemporariesH: 48, KeepTemporariesH: 48,
CacheIgnoredFiles: false, CacheIgnoredFiles: false,
ProgressUpdateIntervalS: 10, ProgressUpdateIntervalS: 10,
DisableSymlinks: true, SymlinksEnabled: false,
} }
cfg, err := Load("testdata/overridenvalues.xml", device1) cfg, err := Load("testdata/overridenvalues.xml", device1)

2
internal/config/testdata/overridenvalues.xml vendored
View File

@ -20,6 +20,6 @@
<keepTemporariesH>48</keepTemporariesH> <keepTemporariesH>48</keepTemporariesH>
<cacheIgnoredFiles>false</cacheIgnoredFiles> <cacheIgnoredFiles>false</cacheIgnoredFiles>
<progressUpdateIntervalS>10</progressUpdateIntervalS> <progressUpdateIntervalS>10</progressUpdateIntervalS>
<disableSymlinks>true</disableSymlinks> <symlinksEnabled>false</symlinksEnabled>
</options> </options>
</configuration> </configuration>

8
internal/model/progressemitter_test.go
View File

@ -31,15 +31,15 @@ func expectEvent(w *events.Subscription, t *testing.T, size int) {
t.Fatal("Unexpected error:", err) t.Fatal("Unexpected error:", err)
} }
if event.Type != events.DownloadProgress { if event.Type != events.DownloadProgress {
t.Fatal("Unexpected event:", event) t.Fatal("Unexpected event:", event)
} }
data := event.Data.(map[string]map[string]*pullerProgress) data := event.Data.(map[string]map[string]*pullerProgress)
if len(data) != size { if len(data) != size {
t.Fatal("Unexpected event data size:", data) t.Fatal("Unexpected event data size:", data)
} }
} }
func expectTimeout(w *events.Subscription, t *testing.T){ func expectTimeout(w *events.Subscription, t *testing.T) {
_, err := w.Poll(timeout) _, err := w.Poll(timeout)
if err != events.ErrTimeout { if err != events.ErrTimeout {
t.Fatal("Unexpected non-Timeout error:", err) t.Fatal("Unexpected non-Timeout error:", err)
@ -78,7 +78,7 @@ func TestProgressEmitter(t *testing.T) {
expectTimeout(w, t) expectTimeout(w, t)
s.pullStarted() s.pullStarted()
expectEvent(w, t, 1) expectEvent(w, t, 1)
expectTimeout(w, t) expectTimeout(w, t)

1
test/h2/config.xml
View File

@ -429,6 +429,7 @@
<apikey>abc123</apikey> <apikey>abc123</apikey>
</gui> </gui>
<options> <options>
<disableSymlinks>true</disableSymlinks>
<listenAddress>127.0.0.1:22002</listenAddress> <listenAddress>127.0.0.1:22002</listenAddress>
<globalAnnounceServer>announce.syncthing.net:22026</globalAnnounceServer> <globalAnnounceServer>announce.syncthing.net:22026</globalAnnounceServer>
<globalAnnounceEnabled>false</globalAnnounceEnabled> <globalAnnounceEnabled>false</globalAnnounceEnabled>