X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fproject-st.go;h=d5939e61cf4cce10ea839afd48a558b0e85a47b4;hb=7c7d90a781082c6bd22d12a5e2451ca61a5198af;hp=c0d25507aa33ebc3af99ed292076b4708fffa69c;hpb=4695555e178bcabe54c5bf82117c9c4cef5440b5;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/project-st.go b/lib/agent/project-st.go
index c0d2550..d5939e6 100644
--- a/lib/agent/project-st.go
+++ b/lib/agent/project-st.go
@@ -1,7 +1,11 @@
 package agent
 
 import (
+	"fmt"
+
 	st "github.com/iotbzh/xds-agent/lib/syncthing"
+	"github.com/iotbzh/xds-agent/lib/xaapiv1"
+	"github.com/iotbzh/xds-server/lib/xsapiv1"
 )
 
 // IPROJECT interface implementation for syncthing projects
@@ -10,7 +14,7 @@ import (
 type STProject struct {
 	*Context
 	server   *XdsServer
-	folder   *XdsFolderConfig
+	folder   *xsapiv1.FolderConfig
 	eventIDs []int
 }
 
@@ -19,13 +23,13 @@ func NewProjectST(ctx *Context, svr *XdsServer) *STProject {
 	p := STProject{
 		Context: ctx,
 		server:  svr,
-		folder:  &XdsFolderConfig{},
+		folder:  &xsapiv1.FolderConfig{},
 	}
 	return &p
 }
 
 // Add a new project
-func (p *STProject) Add(cfg ProjectConfig) (*ProjectConfig, error) {
+func (p *STProject) Add(cfg xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
 	var err error
 
 	// Add project/folder into XDS Server
@@ -48,15 +52,15 @@ func (p *STProject) Add(cfg ProjectConfig) (*ProjectConfig, error) {
 
 	locPrj, err := p.SThg.FolderConfigGet(id)
 	if err != nil {
-		svrPrj.Status = StatusErrorConfig
+		svrPrj.Status = xaapiv1.StatusErrorConfig
 		return nil, err
 	}
 	if svrPrj.ID != locPrj.ID {
 		p.Log.Errorf("Project ID in XDSServer and local ST differ: %s != %s", svrPrj.ID, locPrj.ID)
 	}
 
-	// Use Update function to setup remains fields
-	return p.UpdateProject(*svrPrj)
+	// Use Setup function to setup remains fields
+	return p.Setup(*svrPrj)
 }
 
 // Delete a project
@@ -70,22 +74,22 @@ func (p *STProject) Delete() error {
 }
 
 // GetProject Get public part of project config
-func (p *STProject) GetProject() *ProjectConfig {
+func (p *STProject) GetProject() *xaapiv1.ProjectConfig {
 	prj := p.server.FolderToProject(*p.folder)
 	prj.ServerID = p.server.ID
 	return &prj
 }
 
-// UpdateProject Update project config
-func (p *STProject) UpdateProject(prj ProjectConfig) (*ProjectConfig, error) {
+// Setup Setup local project config
+func (p *STProject) Setup(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
 	// Update folder
 	p.folder = p.server.ProjectToFolder(prj)
 	svrPrj := p.GetProject()
 
 	// Register events to update folder status
 	// Register to XDS Server events
-	p.server.EventOn("event:FolderStateChanged", p._cbServerFolderChanged)
-	if err := p.server.EventRegister("FolderStateChanged", svrPrj.ID); err != nil {
+	p.server.EventOn("event:folder-state-change", "", p._cbServerFolderChanged)
+	if err := p.server.EventRegister("folder-state-change", svrPrj.ID); err != nil {
 		p.Log.Warningf("XDS Server EventRegister failed: %v", err)
 		return svrPrj, err
 	}
@@ -102,6 +106,21 @@ func (p *STProject) UpdateProject(prj ProjectConfig) (*ProjectConfig, error) {
 	return svrPrj, nil
 }
 
+// Update Update some field of a project
+func (p *STProject) Update(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
+
+	if p.folder.ID != prj.ID {
+		return nil, fmt.Errorf("Invalid id")
+	}
+
+	err := p.server.FolderUpdate(p.server.ProjectToFolder(prj), p.folder)
+	if err != nil {
+		return nil, err
+	}
+
+	return p.GetProject(), nil
+}
+
 // GetServer Get the XdsServer that holds this project
 func (p *STProject) GetServer() *XdsServer {
 	return p.server
@@ -127,12 +146,12 @@ func (p *STProject) IsInSync() (bool, error) {
 
 // callback use to update (XDS Server) folder IsInSync status
 
-func (p *STProject) _cbServerFolderChanged(data interface{}) {
-	evt := data.(XdsEventFolderChange)
+func (p *STProject) _cbServerFolderChanged(pData interface{}, data interface{}) error {
+	evt := data.(xsapiv1.EventMsg)
 
 	// Only process event that concerns this project/folder ID
 	if p.folder.ID != evt.Folder.ID {
-		return
+		return nil
 	}
 
 	if evt.Folder.IsInSync != p.folder.DataCloudSync.STSvrIsInSync ||
@@ -141,10 +160,11 @@ func (p *STProject) _cbServerFolderChanged(data interface{}) {
 		p.folder.DataCloudSync.STSvrIsInSync = evt.Folder.IsInSync
 		p.folder.DataCloudSync.STSvrStatus = evt.Folder.Status
 
-		if err := p.events.Emit(EVTProjectChange, p.server.FolderToProject(*p.folder)); err != nil {
-			p.Log.Warningf("Cannot notify project change: %v", err)
+		if err := p.events.Emit(xaapiv1.EVTProjectChange, p.server.FolderToProject(*p.folder), ""); err != nil {
+			p.Log.Warningf("Cannot notify project change (from server): %v", err)
 		}
 	}
+	return nil
 }
 
 // callback use to update IsInSync status
@@ -161,15 +181,15 @@ func (p *STProject) _cbLocalSTEvents(ev st.Event, data *st.EventsCBData) {
 		to := ev.Data["to"]
 		switch to {
 		case "scanning", "syncing":
-			sts = StatusSyncing
+			sts = xaapiv1.StatusSyncing
 		case "idle":
-			sts = StatusEnable
+			sts = xaapiv1.StatusEnable
 		}
 		inSync = (to == "idle")
 
 	case st.EventFolderPaused:
-		if sts == StatusEnable {
-			sts = StatusPause
+		if sts == xaapiv1.StatusEnable {
+			sts = xaapiv1.StatusPause
 		}
 		inSync = false
 	}
@@ -179,8 +199,8 @@ func (p *STProject) _cbLocalSTEvents(ev st.Event, data *st.EventsCBData) {
 		p.folder.DataCloudSync.STLocIsInSync = inSync
 		p.folder.DataCloudSync.STLocStatus = sts
 
-		if err := p.events.Emit(EVTProjectChange, p.server.FolderToProject(*p.folder)); err != nil {
-			p.Log.Warningf("Cannot notify project change: %v", err)
+		if err := p.events.Emit(xaapiv1.EVTProjectChange, p.server.FolderToProject(*p.folder), ""); err != nil {
+			p.Log.Warningf("Cannot notify project change (local): %v", err)
 		}
 	}
 }