import (
"fmt"
"log"
+ "strings"
"time"
+ "github.com/franciscocpg/reflectme"
"github.com/iotbzh/xds-agent/lib/syncthing"
+ "github.com/iotbzh/xds-agent/lib/xaapiv1"
+ "github.com/iotbzh/xds-server/lib/xsapiv1"
"github.com/syncthing/syncthing/lib/sync"
)
if svr.Disabled {
continue
}
- xFlds := []XdsFolderConfig{}
+ xFlds := []xsapiv1.FolderConfig{}
if err := svr.GetFolders(&xFlds); err != nil {
errMsg += fmt.Sprintf("Cannot retrieve folders config of XDS server ID %s : %v \n", svr.ID, err.Error())
continue
return nil
}
+// ResolveID Complete a Project ID (helper for user that can use partial ID value)
+func (p *Projects) ResolveID(id string) (string, error) {
+ if id == "" {
+ return "", nil
+ }
+
+ match := []string{}
+ for iid := range p.projects {
+ if strings.HasPrefix(iid, id) {
+ match = append(match, iid)
+ }
+ }
+
+ if len(match) == 1 {
+ return match[0], nil
+ } else if len(match) == 0 {
+ return id, fmt.Errorf("Unknown id")
+ }
+ return id, fmt.Errorf("Multiple IDs found with provided prefix: " + id)
+}
+
// Get returns the folder config or nil if not existing
func (p *Projects) Get(id string) *IPROJECT {
if id == "" {
}
// GetProjectArr returns the config of all folders as an array
-func (p *Projects) GetProjectArr() []ProjectConfig {
+func (p *Projects) GetProjectArr() []xaapiv1.ProjectConfig {
pjMutex.Lock()
defer pjMutex.Unlock()
}
// GetProjectArrUnsafe Same as GetProjectArr without mutex protection
-func (p *Projects) GetProjectArrUnsafe() []ProjectConfig {
- conf := []ProjectConfig{}
+func (p *Projects) GetProjectArrUnsafe() []xaapiv1.ProjectConfig {
+ conf := []xaapiv1.ProjectConfig{}
for _, v := range p.projects {
prj := (*v).GetProject()
conf = append(conf, *prj)
}
// Add adds a new folder
-func (p *Projects) Add(newF ProjectConfig) (*ProjectConfig, error) {
+func (p *Projects) Add(newF xaapiv1.ProjectConfig, fromSid string) (*xaapiv1.ProjectConfig, error) {
prj, err := p.createUpdate(newF, true, false)
if err != nil {
return prj, err
}
// Notify client with event
- if err := p.events.Emit(EVTProjectAdd, *prj); err != nil {
+ if err := p.events.Emit(xaapiv1.EVTProjectAdd, *prj, fromSid); err != nil {
p.Log.Warningf("Cannot notify project deletion: %v", err)
}
}
// CreateUpdate creates or update a folder
-func (p *Projects) createUpdate(newF ProjectConfig, create bool, initial bool) (*ProjectConfig, error) {
+func (p *Projects) createUpdate(newF xaapiv1.ProjectConfig, create bool, initial bool) (*xaapiv1.ProjectConfig, error) {
var err error
pjMutex.Lock()
var fld IPROJECT
switch newF.Type {
// SYNCTHING
- case TypeCloudSync:
+ case xaapiv1.TypeCloudSync:
if p.SThg != nil {
fld = NewProjectST(p.Context, svr)
} else {
}
// PATH MAP
- case TypePathMap:
+ case xaapiv1.TypePathMap:
fld = NewProjectPathMap(p.Context, svr)
default:
return nil, fmt.Errorf("Unsupported folder type")
}
- var newPrj *ProjectConfig
+ var newPrj *xaapiv1.ProjectConfig
if create {
// Add project on server
if newPrj, err = fld.Add(newF); err != nil {
- newF.Status = StatusErrorConfig
+ newF.Status = xaapiv1.StatusErrorConfig
log.Printf("ERROR Adding project: %v\n", err)
return newPrj, err
}
} else {
// Just update project config
- if newPrj, err = fld.UpdateProject(newF); err != nil {
- newF.Status = StatusErrorConfig
+ if newPrj, err = fld.Setup(newF); err != nil {
+ newF.Status = xaapiv1.StatusErrorConfig
log.Printf("ERROR Updating project: %v\n", err)
return newPrj, err
}
}
// Delete deletes a specific folder
-func (p *Projects) Delete(id string) (ProjectConfig, error) {
+func (p *Projects) Delete(id, fromSid string) (xaapiv1.ProjectConfig, error) {
var err error
pjMutex.Lock()
defer pjMutex.Unlock()
- fld := ProjectConfig{}
+ fld := xaapiv1.ProjectConfig{}
fc, exist := p.projects[id]
if !exist {
- return fld, fmt.Errorf("unknown id")
+ return fld, fmt.Errorf("Unknown id")
}
prj := (*fc).GetProject()
delete(p.projects, id)
// Notify client with event
- if err := p.events.Emit(EVTProjectDelete, *prj); err != nil {
+ if err := p.events.Emit(xaapiv1.EVTProjectDelete, *prj, fromSid); err != nil {
p.Log.Warningf("Cannot notify project deletion: %v", err)
}
}
return (*fc).IsInSync()
}
+
+// Update Update some field of a project
+func (p *Projects) Update(id string, prj xaapiv1.ProjectConfig, fromSid string) (*xaapiv1.ProjectConfig, error) {
+
+ pjMutex.Lock()
+ defer pjMutex.Unlock()
+
+ fc, exist := p.projects[id]
+ if !exist {
+ return nil, fmt.Errorf("Unknown id")
+ }
+
+ // Copy current in a new object to change nothing in case of an error rises
+ newFld := xaapiv1.ProjectConfig{}
+ reflectme.Copy((*fc).GetProject(), &newFld)
+
+ // Only update some fields
+ dirty := false
+ for _, fieldName := range xaapiv1.ProjectConfigUpdatableFields {
+ valNew, err := reflectme.GetField(prj, fieldName)
+ if err == nil {
+ valCur, err := reflectme.GetField(newFld, fieldName)
+ if err == nil && valNew != valCur {
+ err = reflectme.SetField(&newFld, fieldName, valNew)
+ if err != nil {
+ return nil, err
+ }
+ dirty = true
+ }
+ }
+ }
+
+ if !dirty {
+ return &newFld, nil
+ }
+
+ upPrj, err := (*fc).Update(newFld)
+ if err != nil {
+ return nil, err
+ }
+
+ // Notify client with event
+ if err := p.events.Emit(xaapiv1.EVTProjectChange, *upPrj, fromSid); err != nil {
+ p.Log.Warningf("Cannot notify project change: %v", err)
+ }
+ return upPrj, err
+}
Code Review / src / xds / xds-agent.git / blobdiff