Kill right Syncthing (same url) in DEBUG_MODE

[src/xds/xds-agent.git] / lib / syncthing / stfolder.go

diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index a5312eb..2ad6859 100644 (file)
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -6,6 +6,7 @@ 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"
 )
@@ -19,6 +20,48 @@ type FolderChangeArg struct {
        ShareRootDir string
 }
 
+// FolderLoadFromStConfig Load/Retrieve folder config from syncthing database
+func (s *SyncThing) FolderLoadFromStConfig(f *[]folder.FolderConfig) error {
+
+       defaultSdk := "" // cannot know which was the default sdk
+
+       stCfg, err := s.ConfigGet()
+       if err != nil {
+               return err
+       }
+       if len(stCfg.Devices) < 1 {
+               return fmt.Errorf("Cannot load syncthing config: no device defined")
+       }
+       devID := stCfg.Devices[0].DeviceID.String()
+       if devID == s.MyID {
+               if len(stCfg.Devices) < 2 {
+                       return fmt.Errorf("Cannot load syncthing config: no valid device found")
+               }
+               devID = stCfg.Devices[1].DeviceID.String()
+       }
+
+       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{
+                       ID:            stFld.ID,
+                       Label:         stFld.Label,
+                       ClientPath:    strings.TrimRight(cliPath, "/"),
+                       Type:          folder.TypeCloudSync,
+                       Status:        folder.StatusDisable,
+                       DefaultSdk:    defaultSdk,
+                       RootPath:      "", //s.conf.FileConf.ShareRootDir,
+                       DataCloudSync: folder.CloudSyncConfig{SyncThingID: devID},
+               })
+       }
+
+       return nil
+}
+
 // FolderChange is called when configuration has changed
 func (s *SyncThing) FolderChange(f FolderChangeArg) (string, error) {
 
@@ -29,16 +72,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"},
        }
 
@@ -59,7 +103,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
@@ -73,7 +117,7 @@ func (s *SyncThing) FolderChange(f FolderChangeArg) (string, error) {
        folder := stconfig.FolderConfiguration{
                ID:            id,
                Label:         label,
-               RawPath:       pathCli,
+               Path:          pathCli,
                AutoNormalize: true,
        }