Commitf44bc76

committed

Use dedicated Column interface for table formatting nested structs

1 parentdeb23b4 commitf44bc76Copy full SHA for f44bc76

File tree

+17

-6

lines changed

+17

-6

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ type EnvironmentStat struct {`
`54`	`54`	DiskUsedint64`json:"disk_used"`
`55`	`55`	`}`
`56`	`56`
`57`		`-func (eEnvironmentStat)String()string {returnstring(e.ContainerStatus) }`
	`57`	`+// Column defines how EnvironmentStat should format in as a table column.`
	`58`	`+func (eEnvironmentStat)Column()string {returnstring(e.ContainerStatus) }`
`58`	`59`
`59`	`60`	`// EnvironmentStatus refers to the states of an environment.`
`60`	`61`	`typeEnvironmentStatusstring`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ type ImageTag struct {`
`18`	`18`	CreatedAt time.Time`json:"created_at" table:"-"`
`19`	`19`	`}`
`20`	`20`
`21`		`-func (iImageTag)String()string {`
	`21`	`+// Column defines how ImageTag should format in as a table column.`
	`22`	`+func (iImageTag)Column()string {`
`22`	`23`	`returni.Tag`
`23`	`24`	`}`
`24`	`25`
`@@ -29,9 +30,8 @@ type OSRelease struct {`
`29`	`30`	HomeURLstring`json:"home_url"`
`30`	`31`	`}`
`31`	`32`
`32`		`-func (oOSRelease)String()string {`
`33`		`-returno.PrettyName`
`34`		`-}`
	`33`	`+// Column defines how OSRelease should format in as a table column.`
	`34`	`+func (oOSRelease)Column()string {returno.PrettyName }`
`35`	`35`
`36`	`36`	`// CreateImageTagReq defines the request parameters for creating a new image tag.`
`37`	`37`	`typeCreateImageTagReqstruct {`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,11 @@ import (`
`10`	`10`
`11`	`11`	`conststructFieldTagKey="table"`
`12`	`12`
	`13`	`+// Column defines an interface for formatting a type as a column.`
	`14`	`+typeColumninterface {`
	`15`	`+Column()string`
	`16`	`+}`
	`17`	`+`
`13`	`18`	`// StructValues tab delimits the values of a given struct.`
`14`	`19`	`//`
`15`	`20`	// Tag a field `table:"-"` to hide it from output.
`@@ -20,7 +25,12 @@ func StructValues(data interface{}) string {`
`20`	`25`	`ifshouldHideField(v.Type().Field(i)) {`
`21`	`26`	`continue`
`22`	`27`	`}`
`23`		`-fmt.Fprintf(s,"%v\t",v.Field(i).Interface())`
	`28`	`+value:=v.Field(i).Interface()`
	`29`	`+ifcolumn,ok:=value.(Column);ok {`
	`30`	`+fmt.Fprintf(s,"%s\t",column.Column())`
	`31`	`+}else {`
	`32`	`+fmt.Fprintf(s,"%v\t",value)`
	`33`	`+}`
`24`	`34`	`}`
`25`	`35`	`returns.String()`
`26`	`36`	`}`

Comments

(0)