Add folder interface and support native pathmap folder type.

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

diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 661e19d..bbdcc43 100644 (file)
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -1,34 +1,77 @@
 package st
 
 import (
+       "encoding/json"
+       "fmt"
        "path/filepath"
        "strings"
 
-       "github.com/iotbzh/xds-server/lib/xdsconfig"
+       "github.com/iotbzh/xds-server/lib/folder"
        "github.com/syncthing/syncthing/lib/config"
        "github.com/syncthing/syncthing/lib/protocol"
 )
 
+// 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.RawPath, s.conf.FileConf.ShareRootDir)
+               if cliPath == "" {
+                       cliPath = stFld.RawPath
+               }
+               *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 xdsconfig.FolderConfig) error {
+func (s *SyncThing) FolderChange(f folder.FolderConfig) (string, error) {
 
        // Get current config
        stCfg, err := s.ConfigGet()
        if err != nil {
                s.log.Errorln(err)
-               return err
+               return "", err
        }
 
+       stClientID := f.DataCloudSync.SyncThingID
        // Add new Device if needed
        var devID protocol.DeviceID
-       if err := devID.UnmarshalText([]byte(f.SyncThingID)); err != nil {
-               s.log.Errorf("not a valid device id (err %v)\n", err)
-               return err
+       if err := devID.UnmarshalText([]byte(stClientID)); err != nil {
+               s.log.Errorf("not a valid device id (err %v)", err)
+               return "", err
        }
 
        newDevice := config.DeviceConfiguration{
                DeviceID:  devID,
-               Name:      f.SyncThingID,
+               Name:      stClientID,
                Addresses: []string{"dynamic"},
        }
 
@@ -49,13 +92,13 @@ func (s *SyncThing) FolderChange(f xdsconfig.FolderConfig) error {
                label = strings.Split(id, "/")[0]
        }
        if id = f.ID; id == "" {
-               id = f.SyncThingID[0:15] + "_" + label
+               id = stClientID[0:15] + "_" + label
        }
 
        folder := config.FolderConfiguration{
                ID:      id,
                Label:   label,
-               RawPath: filepath.Join(s.conf.FileConf.ShareRootDir, f.RelativePath),
+               RawPath: filepath.Join(s.conf.FileConf.ShareRootDir, f.ClientPath),
        }
 
        if s.conf.FileConf.SThgConf.RescanIntervalS > 0 {
@@ -85,7 +128,7 @@ func (s *SyncThing) FolderChange(f xdsconfig.FolderConfig) error {
                s.log.Errorln(err)
        }
 
-       return nil
+       return id, nil
 }
 
 // FolderDelete is called to delete a folder config
@@ -110,3 +153,63 @@ func (s *SyncThing) FolderDelete(id string) error {
 
        return nil
 }
+
+// FolderConfigGet Returns the configuration of a specific folder
+func (s *SyncThing) FolderConfigGet(folderID string) (config.FolderConfiguration, error) {
+       fc := config.FolderConfiguration{}
+       if folderID == "" {
+               return fc, fmt.Errorf("folderID not set")
+       }
+       cfg, err := s.ConfigGet()
+       if err != nil {
+               return fc, err
+       }
+       for _, f := range cfg.Folders {
+               if f.ID == folderID {
+                       fc = f
+                       return fc, nil
+               }
+       }
+       return fc, fmt.Errorf("id not found")
+}
+
+// FolderStatus Returns all information about the current
+func (s *SyncThing) FolderStatus(folderID string) (*FolderStatus, error) {
+       var data []byte
+       var res FolderStatus
+       if folderID == "" {
+               return nil, fmt.Errorf("folderID not set")
+       }
+       if err := s.client.HTTPGet("db/status?folder="+folderID, &data); err != nil {
+               return nil, err
+       }
+       if err := json.Unmarshal(data, &res); err != nil {
+               return nil, err
+       }
+       return &res, nil
+}
+
+// IsFolderInSync Returns true when folder is in sync
+func (s *SyncThing) IsFolderInSync(folderID string) (bool, error) {
+       // FIXME better to detected FolderCompletion event (/rest/events)
+       // See https://docs.syncthing.net/dev/events.html
+       sts, err := s.FolderStatus(folderID)
+       if err != nil {
+               return false, err
+       }
+       return sts.NeedBytes == 0, nil
+}
+
+// FolderScan Request immediate folder scan.
+// Scan all folders if folderID param is empty
+func (s *SyncThing) FolderScan(folderID string, subpath string) error {
+       url := "db/scan"
+       if folderID != "" {
+               url += "?folder=" + folderID
+
+               if subpath != "" {
+                       url += "&sub=" + subpath
+               }
+       }
+       return s.client.HTTPPost(url, "")
+}