perso/syncthing-arm
Archived
4
0 Fork 0
Code Issues 1 Actions Releases Wiki Activity

Merge pull request #2156 from calmh/stuckatzero

Browse Source 
Don't get stuck at "Syncing 0%" when adding a new folder
This commit is contained in:
Audrius Butkevicius committed 2015-08-14 10:42:01 +01:00
2 parents ae5079f7b4 a5345ac71e
commit 7a9bb65e03
5 files changed
+20 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gui/syncthing/core/syncthingController.js
+1
View File
@@ -1079,6 +1079,7 @@ angular.module('syncthing.core')
selectedDevices: {},
rescanIntervalS: 60,
minDiskFreePct: 1,
order: "random",
fileVersioningSelector: "none",
trashcanClean: 0,
simpleKeep: 5,
lib/auto/gui.files.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
)
const (
AssetsBuildDate = "Fri, 14 Aug 2015 07:13:00 GMT"
AssetsBuildDate = "Fri, 14 Aug 2015 07:36:16 GMT"
)
func Assets() map[string][]byte {
@@ -78,7 +78,7 @@ func Assets() map[string][]byte {
assets["syncthing/core/selectOnClickDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/3SQQWvEIBCF7/srPBRiIEjPXXooe2+hPZYeRKeprJkpo2YpJf+9atLdJWzeSZ/z+Z5q7JPXrAayyYNswg+a+OWwV4YYmnYnspR1DCa6sQyAz8sXPHhnjk0nPlMGHKGQdyeHlk6t+K1QEUNMjFdGkXd4fLjigqFv6ES+dwCMndAxcmhXUNEyoQhlY1bx8hZQNGoWc+cS9iiWlqqH+PZvy3a/yXL+IcicJZNqumHQEV6LvcVVRs2pz2ThQBgzGuTygvf7jw3y3FQxDDTCk/c1KWxFXQBt7Vyqpt8Yn1bedN5N+105/AMAAP//AQAA//+SF+4JDAIAAA==")
assets["syncthing/core/shutdownDialogDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/1SOwQqDQAxE737F3qIg672eCv2F9r6sqQZitsRspRT/vdqC1DnOTDIvSJ85qB9TlxlLmF4SbSDpfUyKUBVule9IMRo9t8KQrUuzXChw6qF297xeUBJXVu79rW9StKzyZ/zMyZSinRycoT5EhuODg+FVeU13imajaI6bN8LZDzYy7B+WtliqtvgAAAD//wEAAP//3qFOo80AAAA=")
assets["syncthing/core/shutdownDialogView.html"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/0TOTaqDMBAH8PXzFMNsXL16gZhNj+AJ0jjWQJwJzgQp1ru3lkK3P/h/uEXGkCGNPepcbZSNEdSCVX1LjZFUEVIU7rHIRuu/TBOCJcvU4763wzcFV1lKJqMWnmBrYM3B6DjQN3+u/MQPD442J77DHBRuRAznMpwlF9cV37juc8o3LwAAAP//AQAA//99X8KxnQAAAA==")
assets["syncthing/core/syncthingController.js"], _ = base64.StdEncoding.DecodeString("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 truncated
assets["syncthing/core/syncthingController.js"], _ = base64.StdEncoding.DecodeString("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 truncated
assets["syncthing/core/uniqueFolderDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/7SSwW4yMQyE7zyFD7+0IK3CHc5/b1V74h5tvKzVkIDtQFHFuzdhUaGwtJWqzgVp4vkYW2vDMnnLZhVd8jiuZB8a7SgsTRMZq8kIsowjxkZpmwdSoE3Ch+gdclVDm/I8xQDjCbwdh4sYNXG4MHpzkzJnBlVYPkaHvqo/vXsKL7MLoDRxjTWgX9VgVVlqaJT95ApbVHzzb21ZkMWkIB21Oj6jtoS7hfUJh8JF1J7+z6Ajzev/fyUpv/cCRdMp7BCki8m7UClsrSdnFe8G+pqCuiiTpPubcyrnjvNBwCFfQvCiaXsMiemsPO3CM2ePM/K86zfdtUPoGYBlWwHrGa3b/6J/a3PHrxf4aScS6OF/dM5B9/ThftzwNnu44p05h/moPL4DAAD//wEAAP//r65WJ1IDAAA=")
assets["syncthing/core/upgradingDialogDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/1yOwQrCMBBE7/2K3LaFkt7tSfAX9B7SNV3YJmW7UUT676YKRZ3jzNudcTFkdmKnNGTGGpZH9DpSDNYnQWgqU2QHEvRKtwLkOYgbCnAixylAa665nFCKpm7M881vEtQs8cv4mIsKeT0YOEL7EylOMzvFs3BJ9xndNqP7K70Q3u2oE8P+Yu2rtemrFwAAAP//AQAA//99zQ2GzwAAAA==")
assets["syncthing/core/upgradingDialogView.html"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/1zOTarDMAwE4PXLKYQ2WSW5gO0zPCg9gHDcVODaxlIIJc3dm5b+QLfDN8yYSx4pAo8W5zJVGjlNCKKks1jkdMoI7HOySLXmpfNcfQzdXBCUNQaL69oe380WbqCVkkTSsG3omj9TnJFC6Zu7wzV5Pe8cWOCz2pvh4Rz88v8YSAIsxPoifb/j4hozPN+75g4AAP//AQAA///kaeW6xgAAAA==")
lib/config/config.go
-6
View File
@@ -404,12 +404,6 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
cfg.Folders[i].Devices = ensureDevicePresent(cfg.Folders[i].Devices, myID)
cfg.Folders[i].Devices = ensureExistingDevices(cfg.Folders[i].Devices, existingDevices)
cfg.Folders[i].Devices = ensureNoDuplicates(cfg.Folders[i].Devices)
if cfg.Folders[i].Copiers == 0 {
cfg.Folders[i].Copiers = 1
}
if cfg.Folders[i].Pullers == 0 {
cfg.Folders[i].Pullers = 16
}
sort.Sort(FolderDeviceConfigurationList(cfg.Folders[i].Devices))
}
lib/config/config_test.go
+2 -2
View File
@@ -89,8 +89,8 @@ func TestDeviceConfig(t *testing.T) {
Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}},
ReadOnly: true,
RescanIntervalS: 600,
Copiers: 1,
Pullers: 16,
Copiers: 0,
Pullers: 0,
Hashers: 0,
AutoNormalize: true,
MinDiskFreePct: 1,
lib/model/rwfolder.go
+15 -1
View File
@@ -66,6 +66,11 @@ const (
dbUpdateShortcutFile
)
const (
defaultCopiers = 1
defaultPullers = 16
)
type dbUpdateJob struct {
file protocol.FileInfo
jobType int
@@ -102,7 +107,7 @@ type rwFolder struct {
}
func newRWFolder(m *Model, shortID uint64, cfg config.FolderConfiguration) *rwFolder {
return &rwFolder{
p := &rwFolder{
stateTracker: stateTracker{
folder: cfg.ID,
mut: sync.NewMutex(),
@@ -131,6 +136,15 @@ func newRWFolder(m *Model, shortID uint64, cfg config.FolderConfiguration) *rwFo
errorsMut: sync.NewMutex(),
}
if p.copiers == 0 {
p.copiers = defaultCopiers
}
if p.pullers == 0 {
p.pullers = defaultPullers
}
return p
}
// Helper function to check whether either the ignorePerm flag has been