update options; usechrome has to be pointer type;

Author: xiahongze

gutils/tasks.go

@@ -40,12 +40,9 @@ func processEntity(ent *models.Entity) {
 		cancel()
 	}()
 
-	var tracker trackers.Tracker
-	switch ent.Options.UseChrome {
-	case true:
+	var tracker trackers.Tracker = trackers.SimpleTracker
+	if ent.Options.UseChrome != nil && *ent.Options.UseChrome {
 		tracker = trackers.ChromeTracker
-	default:
-		tracker = trackers.SimpleTracker
 	}
 
 	content, ok := tracker(&ent.URL, &ent.XPATH)

handlers/create.go

@@ -29,14 +29,14 @@ func Create(c echo.Context) error {
 		ok      bool
 	)
 
-	if !req.Options.UseChrome {
+	if req.Options.UseChrome == nil || !*req.Options.UseChrome {
 		content, ok = trackers.SimpleTracker(&req.URL, &req.XPATH)
 	}
 	if !ok {
-		req.Options.UseChrome = true
+		*req.Options.UseChrome = true
 		log.Println("INFO: Resorting to Chrome")
 	}
-	if req.Options.UseChrome {
+	if req.Options.UseChrome != nil && *req.Options.UseChrome {
 		if content, ok = trackers.ChromeTracker(&req.URL, &req.XPATH); !ok {
 			return c.String(http.StatusBadRequest, content)
 		}

handlers/update.go

@@ -41,10 +41,20 @@ func Update(c echo.Context) error {
 	if req.Options.Threshold != 0 {
 		entity.Options.Threshold = req.Options.Threshold
 	}
-	if req.Options.UseChrome {
+	if req.Options.UseChrome != nil {
 		entity.Options.UseChrome = req.Options.UseChrome
 	}
 
+	if req.Name != "" {
+		entity.Name = req.Name
+	}
+	if req.URL != "" {
+		entity.URL = req.URL
+	}
+	if req.XPATH != "" {
+		entity.XPATH = req.XPATH
+	}
+
 	// update entity
 	ctx1, cancel1 := context.WithTimeout(context.Background(), gutils.CancelWaitTime)
 	defer cancel1()

models/requests.go

@@ -10,7 +10,7 @@ type (
 		AlertType  string  `json:"alertType"`
 		Threshold  float32 `json:"threshold"`
 		MaxRecords int16   `json:"maxRecords"`
-		UseChrome  bool    `json:"useChrome"`
+		UseChrome  *bool   `json:"useChrome"`
 	}
 
 	// CreateRequest defines the contract to add an entry
@@ -24,6 +24,9 @@ type (
 
 	// UpdateRequest defines the contract to update an entry
 	UpdateRequest struct {
+		URL     string         `json:"url"`
+		XPATH   string         `json:"xpath"`
+		Name    string         `json:"name"`
 		Key     *datastore.Key `json:"key"`
 		Options *Options       `json:"options"`
 	}