diff options
Diffstat (limited to 'lib/apiv1')
-rw-r--r-- | lib/apiv1/apiv1.go | 1 | ||||
-rw-r--r-- | lib/apiv1/events.go | 22 | ||||
-rw-r--r-- | lib/apiv1/folders.go | 24 |
3 files changed, 40 insertions, 7 deletions
diff --git a/lib/apiv1/apiv1.go b/lib/apiv1/apiv1.go index d10a08e..fffed2d 100644 --- a/lib/apiv1/apiv1.go +++ b/lib/apiv1/apiv1.go @@ -40,6 +40,7 @@ func New(r *gin.Engine, sess *session.Sessions, cfg *xdsconfig.Config, mfolders s.apiRouter.GET("/folders", s.getFolders) s.apiRouter.GET("/folders/:id", s.getFolder) + s.apiRouter.PUT("/folders/:id", s.updateFolder) s.apiRouter.POST("/folders", s.addFolder) s.apiRouter.POST("/folders/sync/:id", s.syncFolder) s.apiRouter.DELETE("/folders/:id", s.delFolder) diff --git a/lib/apiv1/events.go b/lib/apiv1/events.go index 9444262..d837571 100644 --- a/lib/apiv1/events.go +++ b/lib/apiv1/events.go @@ -2,6 +2,7 @@ package apiv1 import ( "net/http" + "strings" "time" "github.com/iotbzh/xds-server/lib/folder" @@ -29,8 +30,15 @@ type EventMsg struct { } // EventEvent Event send in WS when an internal event (eg. Syncthing event is received) -const EventEventAll = "event:all" -const EventEventType = "event:" // following by event type +const ( + // EventTypePrefix Used as event prefix + EventTypePrefix = "event:" // following by event type + + // Supported Events type + EVTAll = EventTypePrefix + "all" + EVTFolderChange = EventTypePrefix + "folder-change" // type EventMsg with Data type apiv1.??? + EVTFolderStateChange = EventTypePrefix + "folder-state-change" // type EventMsg with Data type apiv1.??? +) // eventsList Registering for events that will be send over a WS func (s *APIService) eventsList(c *gin.Context) { @@ -52,7 +60,7 @@ func (s *APIService) eventsRegister(c *gin.Context) { return } - evType := "FolderStateChanged" + evType := strings.TrimPrefix(EVTFolderStateChange, EventTypePrefix) if args.Name != evType { common.APIError(c, "Unsupported event name") return @@ -79,11 +87,11 @@ func (s *APIService) eventsRegister(c *gin.Context) { Data: ev.Data, } - if err := (*so).Emit(EventEventAll, msg); err != nil { + if err := (*so).Emit(EVTAll, msg); err != nil { s.log.Errorf("WS Emit Event : %v", err) } - if err := (*so).Emit(EventEventType+ev.Type, msg); err != nil { + if err := (*so).Emit(EventTypePrefix+ev.Type, msg); err != nil { s.log.Errorf("WS Emit Event : %v", err) } } @@ -113,9 +121,9 @@ func (s *APIService) eventsRegister(c *gin.Context) { } s.log.Debugf("WS Emit %s - Status=%10s, IsInSync=%6v, ID=%s", - EventEventType+evType, cfg.Status, cfg.IsInSync, cfg.ID) + EventTypePrefix+evType, cfg.Status, cfg.IsInSync, cfg.ID) - if err := (*so).Emit(EventEventType+evType, msg); err != nil { + if err := (*so).Emit(EventTypePrefix+evType, msg); err != nil { s.log.Errorf("WS Emit Folder StateChanged event : %v", err) } } diff --git a/lib/apiv1/folders.go b/lib/apiv1/folders.go index 398e21c..073445c 100644 --- a/lib/apiv1/folders.go +++ b/lib/apiv1/folders.go @@ -105,3 +105,27 @@ func (s *APIService) delFolder(c *gin.Context) { } c.JSON(http.StatusOK, delEntry) } + +// updateFolder update some field of a folder +func (s *APIService) updateFolder(c *gin.Context) { + id, err := s.mfolders.ResolveID(c.Param("id")) + if err != nil { + common.APIError(c, err.Error()) + return + } + + s.log.Debugln("Update folder id ", id) + + var cfgArg folder.FolderConfig + if c.BindJSON(&cfgArg) != nil { + common.APIError(c, "Invalid arguments") + return + } + + upFld, err := s.mfolders.Update(id, cfgArg) + if err != nil { + common.APIError(c, err.Error()) + return + } + c.JSON(http.StatusOK, upFld) +} |