Update auxo to latest version

controller/common.go

@@ -1,19 +1,20 @@
 package controller
 
 import (
+	"github.com/cuigh/auxo/data"
 	"github.com/cuigh/auxo/net/web"
 	"github.com/cuigh/swirl/model"
 )
 
-func newModel(ctx web.Context) web.Map {
-	return web.Map{
+func newModel(ctx web.Context) data.Map {
+	return data.Map{
 		"ContextUser": ctx.User(),
 	}
 }
 
-func newPagerModel(ctx web.Context, totalCount, size, page int) web.Map {
+func newPagerModel(ctx web.Context, totalCount, size, page int) data.Map {
 	pager := model.NewPager(ctx.Request().RequestURI, totalCount, size, page)
-	return newModel(ctx).Add("Pager", pager)
+	return newModel(ctx).Set("Pager", pager)
 }
 
 func ajaxResult(ctx web.Context, err error) error {
@@ -21,14 +22,14 @@ func ajaxResult(ctx web.Context, err error) error {
 		return err
 	}
 
-	return ctx.JSON(web.Map{
+	return ctx.JSON(data.Map{
 		"success": err == nil,
 	})
 }
 
-func ajaxSuccess(ctx web.Context, data interface{}) error {
-	return ctx.JSON(web.Map{
+func ajaxSuccess(ctx web.Context, value interface{}) error {
+	return ctx.JSON(data.Map{
 		"success": true,
-		"data":    data,
+		"data":    value,
 	})
 }

controller/config.go

@@ -41,8 +41,8 @@ func configList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, page).
-		Add("Name", name).
-		Add("Configs", configs)
+		Set("Name", name).
+		Set("Configs", configs)
 	return ctx.Render("config/list", m)
 }
 
@@ -75,7 +75,7 @@ func configEdit(ctx web.Context) error {
 	if err != nil {
 		return err
 	}
-	m := newModel(ctx).Add("Config", cfg)
+	m := newModel(ctx).Set("Config", cfg)
 	return ctx.Render("config/edit", m)
 }
 

controller/container.go

@@ -47,9 +47,9 @@ func containerList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, args.PageIndex).
-		Add("Name", args.Name).
-		Add("Filter", args.Filter).
-		Add("Containers", containers)
+		Set("Name", args.Name).
+		Set("Filter", args.Filter).
+		Set("Containers", containers)
 	return ctx.Render("container/list", m)
 }
 
@@ -60,7 +60,7 @@ func containerDetail(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Container", container)
+	m := newModel(ctx).Set("Container", container)
 	return ctx.Render("container/detail", m)
 }
 
@@ -76,7 +76,7 @@ func containerRaw(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Container", container).Add("Raw", j)
+	m := newModel(ctx).Set("Container", container).Set("Raw", j)
 	return ctx.Render("container/raw", m)
 }
 
@@ -94,8 +94,8 @@ func containerLogs(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Container", container).Add("Line", line).Add("Timestamps", timestamps).
-		Add("Stdout", stdout.String()).Add("Stderr", stderr.String())
+	m := newModel(ctx).Set("Container", container).Set("Line", line).Set("Timestamps", timestamps).
+		Set("Stdout", stdout.String()).Set("Stderr", stderr.String())
 	return ctx.Render("container/logs", m)
 }
 

controller/event.go

@@ -35,6 +35,6 @@ func eventList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, args.PageIndex).
-		Add("Events", events).Add("Args", args)
+		Set("Events", events).Set("Args", args)
 	return ctx.Render("system/event/list", m)
 }

controller/home.go

@@ -39,22 +39,22 @@ func homeIndex(ctx web.Context) (err error) {
 	if count, err = docker.NodeCount(); err != nil {
 		return
 	}
-	m.Add("NodeCount", count)
+	m.Set("NodeCount", count)
 
 	if count, err = docker.NetworkCount(); err != nil {
 		return
 	}
-	m.Add("NetworkCount", count)
+	m.Set("NetworkCount", count)
 
 	if count, err = docker.ServiceCount(); err != nil {
 		return
 	}
-	m.Add("ServiceCount", count)
+	m.Set("ServiceCount", count)
 
 	if count, err = docker.StackCount(); err != nil {
 		return
 	}
-	m.Add("StackCount", count)
+	m.Set("StackCount", count)
 
 	return ctx.Render("index", m)
 }

controller/image.go

@@ -37,8 +37,8 @@ func imageList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, page).
-		Add("Name", name).
-		Add("Images", images)
+		Set("Name", name).
+		Set("Images", images)
 	return ctx.Render("image/list", m)
 }
 
@@ -54,7 +54,7 @@ func imageDetail(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Image", image).Add("Histories", histories)
+	m := newModel(ctx).Set("Image", image).Set("Histories", histories)
 	return ctx.Render("image/detail", m)
 }
 
@@ -70,7 +70,7 @@ func imageRaw(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Image", image).Add("Raw", j)
+	m := newModel(ctx).Set("Image", image).Set("Raw", j)
 	return ctx.Render("image/raw", m)
 }
 

controller/network.go

@@ -38,7 +38,7 @@ func networkList(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Networks", networks)
+	m := newModel(ctx).Set("Networks", networks)
 	return ctx.Render("network/list", m)
 }
 
@@ -85,7 +85,7 @@ func networkDetail(ctx web.Context) error {
 	if err != nil {
 		return err
 	}
-	m := newModel(ctx).Add("Network", network)
+	m := newModel(ctx).Set("Network", network)
 	return ctx.Render("network/detail", m)
 }
 
@@ -101,6 +101,6 @@ func networkRaw(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Network", name).Add("Raw", j)
+	m := newModel(ctx).Set("Network", name).Set("Raw", j)
 	return ctx.Render("network/raw", m)
 }

controller/node.go

@@ -35,7 +35,7 @@ func nodeList(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Nodes", nodes)
+	m := newModel(ctx).Set("Nodes", nodes)
 	return ctx.Render("node/list", m)
 }
 
@@ -57,7 +57,7 @@ func nodeDetail(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Node", node).Add("Tasks", tasks)
+	m := newModel(ctx).Set("Node", node).Set("Tasks", tasks)
 	return ctx.Render("node/detail", m)
 }
 
@@ -73,7 +73,7 @@ func nodeRaw(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("ID", id).Add("Node", node).Add("Raw", j)
+	m := newModel(ctx).Set("ID", id).Set("Node", node).Set("Raw", j)
 	return ctx.Render("node/raw", m)
 }
 
@@ -84,7 +84,7 @@ func nodeEdit(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Node", node)
+	m := newModel(ctx).Set("Node", node)
 	return ctx.Render("node/edit", m)
 }
 

controller/profile.go

@@ -30,7 +30,7 @@ func profileIndex(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("User", user)
+	m := newModel(ctx).Set("User", user)
 	return ctx.Render("profile/index", m)
 }
 

controller/registry.go

@@ -30,7 +30,7 @@ func registryList(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Registries", registries)
+	m := newModel(ctx).Set("Registries", registries)
 	return ctx.Render("registry/list", m)
 }
 

controller/role.go

@@ -37,12 +37,12 @@ func roleIndex(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Roles", roles)
+	m := newModel(ctx).Set("Roles", roles)
 	return ctx.Render("system/role/list", m)
 }
 
 func roleNew(ctx web.Context) error {
-	m := newModel(ctx).Add("Perms", misc.Perms)
+	m := newModel(ctx).Set("Perms", misc.Perms)
 	return ctx.Render("system/role/new", m)
 }
 
@@ -75,7 +75,7 @@ func roleDetail(ctx web.Context) error {
 	for _, p := range role.Perms {
 		perms[p] = model.Placeholder
 	}
-	m := newModel(ctx).Add("Role", role).Add("Perms", misc.Perms).Add("CheckedPerms", perms)
+	m := newModel(ctx).Set("Role", role).Set("Perms", misc.Perms).Set("CheckedPerms", perms)
 	return ctx.Render("system/role/detail", m)
 }
 
@@ -93,7 +93,7 @@ func roleEdit(ctx web.Context) error {
 	for _, p := range role.Perms {
 		perms[p] = model.Placeholder
 	}
-	m := newModel(ctx).Add("Role", role).Add("Perms", misc.Perms).Add("CheckedPerms", perms)
+	m := newModel(ctx).Set("Role", role).Set("Perms", misc.Perms).Set("CheckedPerms", perms)
 	return ctx.Render("system/role/edit", m)
 }
 

controller/secret.go

@@ -40,8 +40,8 @@ func secretList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, page).
-		Add("Name", name).
-		Add("Secrets", secrets)
+		Set("Name", name).
+		Set("Secrets", secrets)
 	return ctx.Render("secret/list", m)
 }
 
@@ -82,7 +82,7 @@ func secretEdit(ctx web.Context) error {
 	if err != nil {
 		return err
 	}
-	m := newModel(ctx).Add("Secret", secret)
+	m := newModel(ctx).Set("Secret", secret)
 	return ctx.Render("secret/edit", m)
 }
 

controller/service.go

@@ -5,7 +5,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cuigh/auxo/data/set"
 	"github.com/cuigh/auxo/errors"
 	"github.com/cuigh/auxo/net/web"
 	"github.com/cuigh/auxo/util/cast"
@@ -13,6 +12,7 @@ import (
 	"github.com/cuigh/swirl/biz/docker"
 	"github.com/cuigh/swirl/misc"
 	"github.com/cuigh/swirl/model"
+	"mtime.com/auxo/data/set"
 )
 
 // ServiceController is a controller of docker service
@@ -56,8 +56,8 @@ func serviceList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, page).
-		Add("Name", name).
-		Add("Services", services)
+		Set("Name", name).
+		Set("Services", services)
 	return ctx.Render("service/list", m)
 }
 
@@ -87,7 +87,7 @@ func serviceDetail(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Service", info).Add("Tasks", tasks).Add("Command", cmd)
+	m := newModel(ctx).Set("Service", info).Set("Tasks", tasks).Set("Command", cmd)
 	return ctx.Render("service/detail", m)
 }
 
@@ -103,7 +103,7 @@ func serviceRaw(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Service", name).Add("Raw", j)
+	m := newModel(ctx).Set("Service", name).Set("Raw", j)
 	return ctx.Render("service/raw", m)
 }
 
@@ -116,8 +116,8 @@ func serviceLogs(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Service", name).Add("Line", line).Add("Timestamps", timestamps).
-		Add("Stdout", stdout.String()).Add("Stderr", stderr.String())
+	m := newModel(ctx).Set("Service", name).Set("Line", line).Set("Timestamps", timestamps).
+		Set("Stdout", stdout.String()).Set("Stderr", stderr.String())
 	return ctx.Render("service/logs", m)
 }
 
@@ -177,9 +177,9 @@ func serviceNew(ctx web.Context) error {
 	}
 	checkedNetworks := set.FromSlice(service.Networks, func(i int) interface{} { return service.Networks[i] })
 
-	m := newModel(ctx).Add("Service", service).Add("Registries", registries).
-		Add("Networks", networks).Add("CheckedNetworks", checkedNetworks).
-		Add("Secrets", secrets).Add("Configs", configs)
+	m := newModel(ctx).Set("Service", service).Set("Registries", registries).
+		Set("Networks", networks).Set("CheckedNetworks", checkedNetworks).
+		Set("Secrets", secrets).Set("Configs", configs)
 	return ctx.Render("service/new", m)
 }
 
@@ -194,9 +194,9 @@ func serviceCreate(ctx web.Context) error {
 		var registry *model.Registry
 		registry, err = biz.Registry.Get(info.Registry)
 		if err != nil {
-			return errors.Wrap("Load registry info failed", err)
+			return errors.Wrap(err, "load registry info failed")
 		} else if registry == nil {
-			return errors.New("Can't load registry info")
+			return errors.New("can't load registry info")
 		}
 
 		info.Image = registry.URL + "/" + info.Image
@@ -232,9 +232,9 @@ func serviceEdit(ctx web.Context) error {
 	stack := service.Spec.Labels["com.docker.stack.namespace"]
 	checkedNetworks := set.FromSlice(service.Endpoint.VirtualIPs, func(i int) interface{} { return service.Endpoint.VirtualIPs[i].NetworkID })
 
-	m := newModel(ctx).Add("Service", model.NewServiceInfo(service)).Add("Stack", stack).
-		Add("Networks", networks).Add("CheckedNetworks", checkedNetworks).
-		Add("Secrets", secrets).Add("Configs", configs)
+	m := newModel(ctx).Set("Service", model.NewServiceInfo(service)).Set("Stack", stack).
+		Set("Networks", networks).Set("CheckedNetworks", checkedNetworks).
+		Set("Secrets", secrets).Set("Configs", configs)
 	return ctx.Render("service/edit", m)
 }
 

controller/setting.go

@@ -26,7 +26,7 @@ func settingIndex(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Setting", setting)
+	m := newModel(ctx).Set("Setting", setting)
 	return ctx.Render("system/setting/index", m)
 }
 

controller/stack.go

@@ -44,7 +44,7 @@ func stackTaskList(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Stacks", stacks)
+	m := newModel(ctx).Set("Stacks", stacks)
 	return ctx.Render("stack/task/list", m)
 }
 
@@ -74,8 +74,8 @@ func stackArchiveList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, args.PageIndex).
-		Add("Name", args.Name).
-		Add("Archives", archives)
+		Set("Name", args.Name).
+		Set("Archives", archives)
 	return ctx.Render("stack/archive/list", m)
 }
 
@@ -89,7 +89,7 @@ func stackArchiveDetail(ctx web.Context) error {
 		return web.ErrNotFound
 	}
 
-	m := newModel(ctx).Add("Archive", archive)
+	m := newModel(ctx).Set("Archive", archive)
 	return ctx.Render("stack/archive/detail", m)
 }
 
@@ -103,7 +103,7 @@ func stackArchiveEdit(ctx web.Context) error {
 		return web.ErrNotFound
 	}
 
-	m := newModel(ctx).Add("Archive", archive)
+	m := newModel(ctx).Set("Archive", archive)
 	return ctx.Render("stack/archive/edit", m)
 }
 

controller/task.go

@@ -40,8 +40,8 @@ func taskList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, args.PageSize, args.PageIndex).
-		Add("Args", args).
-		Add("Tasks", tasks)
+		Set("Args", args).
+		Set("Tasks", tasks)
 	return ctx.Render("task/list", m)
 }
 
@@ -52,7 +52,7 @@ func taskDetail(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Task", task)
+	m := newModel(ctx).Set("Task", task)
 	return ctx.Render("task/detail", m)
 }
 
@@ -68,6 +68,6 @@ func taskRaw(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Task", task).Add("Raw", j)
+	m := newModel(ctx).Set("Task", task).Set("Raw", j)
 	return ctx.Render("task/raw", m)
 }

controller/template.go

@@ -3,7 +3,7 @@ package controller
 import (
 	"encoding/json"
 
-	"github.com/cuigh/auxo/data/set"
+	"github.com/cuigh/auxo/data"
 	"github.com/cuigh/auxo/net/web"
 	"github.com/cuigh/swirl/biz"
 	"github.com/cuigh/swirl/biz/docker"
@@ -49,8 +49,8 @@ func templateList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, args.PageIndex).
-		Add("Name", args.Name).
-		Add("Templates", tpls)
+		Set("Name", args.Name).
+		Set("Templates", tpls)
 	return ctx.Render("service/template/list", m)
 }
 
@@ -72,9 +72,9 @@ func templateNew(ctx web.Context) error {
 	if err != nil {
 		return err
 	}
-	m := newModel(ctx).Add("Action", "New").Add("Service", service).Add("Registries", registries).
-		Add("Networks", networks).Add("CheckedNetworks", set.Set{}).
-		Add("Secrets", secrets).Add("Configs", configs)
+	m := newModel(ctx).Set("Action", "New").Set("Service", service).Set("Registries", registries).
+		Set("Networks", networks).Set("CheckedNetworks", data.Set{}).
+		Set("Secrets", secrets).Set("Configs", configs)
 	return ctx.Render("service/template/edit", m)
 }
 
@@ -140,11 +140,13 @@ func templateEdit(ctx web.Context) error {
 	if err != nil {
 		return err
 	}
-	checkedNetworks := set.FromSlice(service.Networks, func(i int) interface{} { return service.Networks[i] })
 
-	m := newModel(ctx).Add("Action", "Edit").Add("Service", service).Add("Registries", registries).
-		Add("Networks", networks).Add("CheckedNetworks", checkedNetworks).
-		Add("Secrets", secrets).Add("Configs", configs)
+	checkedNetworks := data.NewSet()
+	checkedNetworks.AddSlice(service.Networks, func(i int) interface{} { return service.Networks[i] })
+
+	m := newModel(ctx).Set("Action", "Edit").Set("Service", service).Set("Registries", registries).
+		Set("Networks", networks).Set("CheckedNetworks", checkedNetworks).
+		Set("Secrets", secrets).Set("Configs", configs)
 	return ctx.Render("service/template/edit", m)
 }
 

controller/user.go

@@ -52,9 +52,9 @@ func userIndex(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, args.PageIndex).
-		Add("Query", args.Query).
-		Add("Filter", args.Filter).
-		Add("Users", users)
+		Set("Query", args.Query).
+		Set("Filter", args.Filter).
+		Set("Users", users)
 	return ctx.Render("system/user/list", m)
 }
 
@@ -64,7 +64,7 @@ func userNew(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Roles", roles)
+	m := newModel(ctx).Set("Roles", roles)
 	return ctx.Render("system/user/new", m)
 }
 
@@ -106,7 +106,7 @@ func userDetail(ctx web.Context) error {
 		}
 	}
 
-	m := newModel(ctx).Add("User", user).Add("Roles", roles)
+	m := newModel(ctx).Set("User", user).Set("Roles", roles)
 	return ctx.Render("system/user/detail", m)
 }
 
@@ -129,7 +129,7 @@ func userEdit(ctx web.Context) error {
 	for _, id := range user.Roles {
 		userRoles[id] = model.Placeholder
 	}
-	m := newModel(ctx).Add("User", user).Add("Roles", roles).Add("UserRoles", userRoles)
+	m := newModel(ctx).Set("User", user).Set("Roles", roles).Set("UserRoles", userRoles)
 	return ctx.Render("system/user/edit", m)
 }
 

controller/volume.go

@@ -44,8 +44,8 @@ func volumeList(ctx web.Context) error {
 	}
 
 	m := newPagerModel(ctx, totalCount, model.PageSize, page).
-		//Add("Name", name).
-		Add("Volumes", volumes)
+		//Set("Name", name).
+		Set("Volumes", volumes)
 	return ctx.Render("volume/list", m)
 }
 
@@ -93,7 +93,7 @@ func volumeDetail(ctx web.Context) error {
 	if err != nil {
 		return err
 	}
-	m := newModel(ctx).Add("Volume", volume)
+	m := newModel(ctx).Set("Volume", volume)
 	return ctx.Render("volume/detail", m)
 }
 
@@ -109,6 +109,6 @@ func volumeRaw(ctx web.Context) error {
 		return err
 	}
 
-	m := newModel(ctx).Add("Volume", name).Add("Raw", j)
+	m := newModel(ctx).Set("Volume", name).Set("Raw", j)
 	return ctx.Render("volume/raw", m)
 }