Browse Source

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

Simon Frei 7 years ago
parent
commit
9d2b744c12
3 changed files with 5 additions and 10 deletions
  1. 5 0
      lib/model/folder.go
  2. 0 6
      lib/model/folder_sendonly.go
  3. 0 4
      lib/model/folder_sendrecv.go

+ 5 - 0
lib/model/folder.go

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

+ 0 - 6
lib/model/folder_sendonly.go

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

+ 0 - 4
lib/model/folder_sendrecv.go

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