Added webapp Dashboard + logic to interact with server.

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

diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index d79e579..a5312eb 100644 (file)
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -1,10 +1,12 @@
 package st
 
 import (
-       "path/filepath"
+       "encoding/json"
+       "fmt"
        "strings"
 
-       "github.com/syncthing/syncthing/lib/config"
+       common "github.com/iotbzh/xds-common/golib"
+       stconfig "github.com/syncthing/syncthing/lib/config"
        "github.com/syncthing/syncthing/lib/protocol"
 )
 
@@ -18,23 +20,23 @@ type FolderChangeArg struct {
 }
 
 // FolderChange is called when configuration has changed
-func (s *SyncThing) FolderChange(f FolderChangeArg) error {
+func (s *SyncThing) FolderChange(f FolderChangeArg) (string, error) {
 
        // Get current config
        stCfg, err := s.ConfigGet()
        if err != nil {
                s.log.Errorln(err)
-               return err
+               return "", err
        }
 
        // 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
+               s.log.Errorf("not a valid device id (err %v)", err)
+               return "", err
        }
 
-       newDevice := config.DeviceConfiguration{
+       newDevice := stconfig.DeviceConfiguration{
                DeviceID:  devID,
                Name:      f.SyncThingID,
                Addresses: []string{"dynamic"},
@@ -60,18 +62,33 @@ func (s *SyncThing) FolderChange(f FolderChangeArg) error {
                id = f.SyncThingID[0:15] + "_" + label
        }
 
-       folder := config.FolderConfiguration{
-               ID:      id,
-               Label:   label,
-               RawPath: filepath.Join(f.ShareRootDir, f.RelativePath),
+       // Resolve local path
+       pathCli, err := common.ResolveEnvVar(f.RelativePath)
+       if err != nil {
+               pathCli = f.RelativePath
+       }
+       // SEB still need ShareRootDir ? a sup
+       // pathCli := filepath.Join(f.ShareRootDir, f.RelativePath)
+
+       folder := stconfig.FolderConfiguration{
+               ID:            id,
+               Label:         label,
+               RawPath:       pathCli,
+               AutoNormalize: true,
        }
 
-       folder.Devices = append(folder.Devices, config.FolderDeviceConfiguration{
+       /* TODO - add it ?
+       if s.conf.FileConf.SThgConf.RescanIntervalS > 0 {
+               folder.RescanIntervalS = s.conf.FileConf.SThgConf.RescanIntervalS
+       }
+       */
+
+       folder.Devices = append(folder.Devices, stconfig.FolderDeviceConfiguration{
                DeviceID: newDevice.DeviceID,
        })
 
        found = false
-       var fld config.FolderConfiguration
+       var fld stconfig.FolderConfiguration
        for _, fld = range stCfg.Folders {
                if folder.ID == fld.ID {
                        fld = folder
@@ -89,7 +106,7 @@ func (s *SyncThing) FolderChange(f FolderChangeArg) error {
                s.log.Errorln(err)
        }
 
-       return nil
+       return id, nil
 }
 
 // FolderDelete is called to delete a folder config
@@ -114,3 +131,61 @@ func (s *SyncThing) FolderDelete(id string) error {
 
        return nil
 }
+
+// FolderConfigGet Returns the configuration of a specific folder
+func (s *SyncThing) FolderConfigGet(folderID string) (stconfig.FolderConfiguration, error) {
+       fc := stconfig.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) {
+       sts, err := s.FolderStatus(folderID)
+       if err != nil {
+               return false, err
+       }
+       return sts.NeedBytes == 0 && sts.State == "idle", 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, "")
+}