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

lib/model: Move String method to folder (#4964)

Browse Source
This commit is contained in:
Simon Frei 2018-05-23 09:23:21 +02:00 committed by Audrius Butkevicius
parent 91f1f3067a
commit 9d2b744c12
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/model/folder.go
View File

@ -9,6 +9,7 @@ package model
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"math/rand" "math/rand"
"time" "time"
@ -389,3 +390,7 @@ func (f *folder) basePause() time.Duration {
} }
return time.Duration(f.PullerPauseS) * time.Second return time.Duration(f.PullerPauseS) * time.Second
} }
func (f *folder) String() string {
return fmt.Sprintf("%s/%s@%p", f.Type, f.folderID, f)
}

6
lib/model/folder_sendonly.go
View File

@ -7,8 +7,6 @@
package model package model
import ( import (
"fmt"
"github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/db"
"github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/fs"
@ -32,10 +30,6 @@ func newSendOnlyFolder(model *Model, cfg config.FolderConfiguration, _ versioner
return f return f
} }
func (f *sendOnlyFolder) String() string {
return fmt.Sprintf("sendOnlyFolder/%s@%p", f.folderID, f)
}
func (f *sendOnlyFolder) PullErrors() []FileError { func (f *sendOnlyFolder) PullErrors() []FileError {
return nil return nil
} }

4
lib/model/folder_sendrecv.go
View File

@ -131,10 +131,6 @@ func newSendReceiveFolder(model *Model, cfg config.FolderConfiguration, ver vers
return f return f
} }
func (f *sendReceiveFolder) String() string {
return fmt.Sprintf("sendReceiveFolder/%s@%p", f.folderID, f)
}
func (f *sendReceiveFolder) pull() bool { func (f *sendReceiveFolder) pull() bool {
select { select {
case <-f.initialScanFinished: case <-f.initialScanFinished: