X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fstfolder.go;h=196e3c7ec1e702d9d3f8990fc35678740c5296c9;hb=2d90eac319979dba64371258b30e61e77a15db7d;hp=d5c74ef00b0facacc2d502f8a577d32569e59fe1;hpb=d917dcca04b8d5f5a7a4fdf82d0a66ef14611fca;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index d5c74ef..196e3c7 100644
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -6,22 +6,21 @@ import (
 	"strings"
 
 	common "github.com/iotbzh/xds-common/golib"
-	"github.com/iotbzh/xds-server/lib/folder"
 	stconfig "github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/protocol"
 )
 
-// FIXME remove and use an interface on xdsconfig.FolderConfig
+// FolderChangeArg argument structure used by FolderChange
 type FolderChangeArg struct {
 	ID           string
 	Label        string
 	RelativePath string
 	SyncThingID  string
-	ShareRootDir string
 }
 
 // FolderLoadFromStConfig Load/Retrieve folder config from syncthing database
-func (s *SyncThing) FolderLoadFromStConfig(f *[]folder.FolderConfig) error {
+/*
+func (s *SyncThing) FolderLoadFromStConfig(f *[]XdsFolderConfig) error {
 
 	defaultSdk := "" // cannot know which was the default sdk
 
@@ -41,26 +40,21 @@ func (s *SyncThing) FolderLoadFromStConfig(f *[]folder.FolderConfig) error {
 	}
 
 	for _, stFld := range stCfg.Folders {
-		/*
-			cliPath := strings.TrimPrefix(stFld.Path, s.conf.FileConf.ShareRootDir)
-			if cliPath == "" {
-				cliPath = stFld.Path
-			}*/
-		cliPath := stFld.Path
-		*f = append(*f, folder.FolderConfig{
+		*f = append(*f, XdsFolderConfig{
 			ID:            stFld.ID,
 			Label:         stFld.Label,
-			ClientPath:    strings.TrimRight(cliPath, "/"),
-			Type:          folder.TypeCloudSync,
-			Status:        folder.StatusDisable,
+			ClientPath:    strings.TrimRight(stFld.Path, "/"),
+			Type:          XdsTypeCloudSync,
+			Status:        StatusDisable,
 			DefaultSdk:    defaultSdk,
-			RootPath:      "", //s.conf.FileConf.ShareRootDir,
-			DataCloudSync: folder.CloudSyncConfig{SyncThingID: devID},
+			RootPath:      "",
+			DataCloudSync: XdsCloudSyncConfig{SyncThingID: devID},
 		})
 	}
 
 	return nil
 }
+*/
 
 // FolderChange is called when configuration has changed
 func (s *SyncThing) FolderChange(f FolderChangeArg) (string, error) {
@@ -72,16 +66,17 @@ func (s *SyncThing) FolderChange(f FolderChangeArg) (string, error) {
 		return "", err
 	}
 
+	stClientID := f.SyncThingID
 	// Add new Device if needed
 	var devID protocol.DeviceID
-	if err := devID.UnmarshalText([]byte(f.SyncThingID)); err != nil {
+	if err := devID.UnmarshalText([]byte(stClientID)); err != nil {
 		s.log.Errorf("not a valid device id (err %v)", err)
 		return "", err
 	}
 
 	newDevice := stconfig.DeviceConfiguration{
 		DeviceID:  devID,
-		Name:      f.SyncThingID,
+		Name:      stClientID,
 		Addresses: []string{"dynamic"},
 	}
 
@@ -102,7 +97,7 @@ func (s *SyncThing) FolderChange(f FolderChangeArg) (string, error) {
 		label = strings.Split(id, "/")[0]
 	}
 	if id = f.ID; id == "" {
-		id = f.SyncThingID[0:15] + "_" + label
+		id = stClientID[0:15] + "_" + label
 	}
 
 	// Resolve local path
@@ -110,8 +105,6 @@ func (s *SyncThing) FolderChange(f FolderChangeArg) (string, error) {
 	if err != nil {
 		pathCli = f.RelativePath
 	}
-	// SEB still need ShareRootDir ? a sup
-	// pathCli := filepath.Join(f.ShareRootDir, f.RelativePath)
 
 	folder := stconfig.FolderConfiguration{
 		ID:            id,
@@ -145,11 +138,8 @@ func (s *SyncThing) FolderChange(f FolderChangeArg) (string, error) {
 	}
 
 	err = s.ConfigSet(stCfg)
-	if err != nil {
-		s.log.Errorln(err)
-	}
 
-	return id, nil
+	return id, err
 }
 
 // FolderDelete is called to delete a folder config