X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fst.go;h=3380cda785ce7515f99c901c8f0b38e2802f3410;hb=ab1170e65d6d03dd1eb2542b5fc47694d7785e70;hp=9452fbd6b9aacbde7c8e172d654a5110814f9e91;hpb=40a7183f3b4aa32379aa8b4949f5f9c5e32f79f6;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 9452fbd..3380cda 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -15,8 +15,12 @@ import (
 
 	"io"
 
+	"io/ioutil"
+
+	"regexp"
+
 	"github.com/Sirupsen/logrus"
-	"github.com/iotbzh/xds-server/lib/common"
+	common "github.com/iotbzh/xds-common/golib"
 	"github.com/iotbzh/xds-server/lib/xdsconfig"
 	"github.com/syncthing/syncthing/lib/config"
 )
@@ -34,6 +38,7 @@ type SyncThing struct {
 	logsDir     string
 	exitSTChan  chan ExitChan
 	exitSTIChan chan ExitChan
+	conf        *xdsconfig.Config
 	client      *common.HTTPClient
 	log         *logrus.Logger
 }
@@ -44,6 +49,42 @@ type ExitChan struct {
 	err    error
 }
 
+// ConfigInSync Check whether if Syncthing configuration is in sync
+type configInSync struct {
+	ConfigInSync bool `json:"configInSync"`
+}
+
+// FolderStatus Information about the current status of a folder.
+type FolderStatus struct {
+	GlobalFiles       int   `json:"globalFiles"`
+	GlobalDirectories int   `json:"globalDirectories"`
+	GlobalSymlinks    int   `json:"globalSymlinks"`
+	GlobalDeleted     int   `json:"globalDeleted"`
+	GlobalBytes       int64 `json:"globalBytes"`
+
+	LocalFiles       int   `json:"localFiles"`
+	LocalDirectories int   `json:"localDirectories"`
+	LocalSymlinks    int   `json:"localSymlinks"`
+	LocalDeleted     int   `json:"localDeleted"`
+	LocalBytes       int64 `json:"localBytes"`
+
+	NeedFiles       int   `json:"needFiles"`
+	NeedDirectories int   `json:"needDirectories"`
+	NeedSymlinks    int   `json:"needSymlinks"`
+	NeedDeletes     int   `json:"needDeletes"`
+	NeedBytes       int64 `json:"needBytes"`
+
+	InSyncFiles int   `json:"inSyncFiles"`
+	InSyncBytes int64 `json:"inSyncBytes"`
+
+	State        string    `json:"state"`
+	StateChanged time.Time `json:"stateChanged"`
+
+	Sequence int64 `json:"sequence"`
+
+	IgnorePatterns bool `json:"ignorePatterns"`
+}
+
 // NewSyncThing creates a new instance of Syncthing
 func NewSyncThing(conf *xdsconfig.Config, log *logrus.Logger) *SyncThing {
 	var url, apiKey, home, binDir string
@@ -81,6 +122,7 @@ func NewSyncThing(conf *xdsconfig.Config, log *logrus.Logger) *SyncThing {
 		binDir:  binDir,
 		logsDir: conf.FileConf.LogsDir,
 		log:     log,
+		conf:    conf,
 	}
 
 	return &s
@@ -168,31 +210,50 @@ func (s *SyncThing) Start() (*exec.Cmd, error) {
 
 	env := []string{
 		"STNODEFAULTFOLDER=1",
+		"STNOUPGRADE=1",
+		"STNORESTART=1",
 	}
 
 	s.STCmd, err = s.startProc("syncthing", args, env, &s.exitSTChan)
 
+	// Use autogenerated apikey if not set by config.json
+	if s.APIKey == "" {
+		if fd, err := os.Open(filepath.Join(s.Home, "config.xml")); err == nil {
+			defer fd.Close()
+			if b, err := ioutil.ReadAll(fd); err == nil {
+				re := regexp.MustCompile("<apikey>(.*)</apikey>")
+				key := re.FindStringSubmatch(string(b))
+				if len(key) >= 1 {
+					s.APIKey = key[1]
+				}
+			}
+		}
+	}
+
 	return s.STCmd, err
 }
 
 // StartInotify Starts syncthing-inotify process
 func (s *SyncThing) StartInotify() (*exec.Cmd, error) {
 	var err error
+	exeName := "syncthing-inotify"
 
-	s.log.Infof(" STI home=%s", s.Home)
 	s.log.Infof(" STI  url=%s", s.BaseURL)
 
 	args := []string{
-		"--home=" + s.Home,
 		"-target=" + s.BaseURL,
 	}
+	if s.APIKey != "" {
+		args = append(args, "-api="+s.APIKey)
+		s.log.Infof("%s uses apikey=%s", exeName, s.APIKey)
+	}
 	if s.log.Level == logrus.DebugLevel {
 		args = append(args, "-verbosity=4")
 	}
 
 	env := []string{}
 
-	s.STICmd, err = s.startProc("syncthing-inotify", args, env, &s.exitSTIChan)
+	s.STICmd, err = s.startProc(exeName, args, env, &s.exitSTIChan)
 
 	return s.STICmd, err
 }
@@ -286,3 +347,57 @@ func (s *SyncThing) ConfigSet(cfg config.Configuration) error {
 	}
 	return s.client.HTTPPost("system/config", string(body))
 }
+
+// IsConfigInSync Returns true if configuration is in sync
+func (s *SyncThing) IsConfigInSync() (bool, error) {
+	var data []byte
+	var d configInSync
+	if err := s.client.HTTPGet("system/config/insync", &data); err != nil {
+		return false, err
+	}
+	if err := json.Unmarshal(data, &d); err != nil {
+		return false, err
+	}
+	return d.ConfigInSync, nil
+}
+
+// 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, "")
+}