improve list output

vilmibm · vilmibm · commit 269adab75a6a · 2020-09-14T10:33:29.000-05:00
diff --git a/pkg/cmd/gist/list/http.go b/pkg/cmd/gist/list/http.go
@@ -5,20 +5,13 @@ import (
 	"net/http"
 	"net/url"
 	"sort"
-	"time"
 
 	"github.com/cli/cli/api"
+	"github.com/cli/cli/pkg/cmd/gist/shared"
 )
 
-type Gist struct {
-	Description string
-	HTMLURL     string    `json:"html_url"`
-	UpdatedAt   time.Time `json:"updated_at"`
-	Public      bool
-}
-
-func listGists(client *http.Client, hostname string, limit int, visibility string) ([]Gist, error) {
-	result := []Gist{}
+func listGists(client *http.Client, hostname string, limit int, visibility string) ([]shared.Gist, error) {
+	result := []shared.Gist{}
 
 	query := url.Values{}
 	if visibility == "all" {
@@ -33,7 +26,7 @@ func listGists(client *http.Client, hostname string, limit int, visibility strin
 		return nil, err
 	}
 
-	gists := []Gist{}
+	gists := []shared.Gist{}
 
 	for _, gist := range result {
 		if len(gists) == limit {
diff --git a/pkg/cmd/gist/list/list.go b/pkg/cmd/gist/list/list.go
@@ -3,6 +3,7 @@ package list
 import (
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/cli/cli/internal/ghinstance"
 	"github.com/cli/cli/pkg/cmdutil"
@@ -75,14 +76,24 @@ func listRun(opts *ListOptions) error {
 	tp := utils.NewTablePrinter(opts.IO)
 
 	for _, gist := range gists {
-		// TODO i was getting confusing results with table printer's truncation
-		description := gist.Description
-		if len(description) > 30 {
-			description = description[0:27] + "..."
+		fileCount := 0
+		for _, _ = range gist.Files {
+			fileCount++
 		}
 
-		tp.AddField(description, nil, cs.Bold)
-		tp.AddField(gist.HTMLURL, nil, nil)
+		visibility := "public"
+		visColor := cs.Green
+		if !gist.Public {
+			visibility = "secret"
+			visColor = cs.Red
+		}
+
+		updatedAt := utils.FuzzyAgo(time.Since(gist.UpdatedAt))
+		tp.AddField(gist.ID, nil, nil)
+		tp.AddField(gist.Description, nil, cs.Bold)
+		tp.AddField(utils.Pluralize(fileCount, "file"), nil, nil)
+		tp.AddField(visibility, nil, visColor)
+		tp.AddField(updatedAt, nil, utils.Gray)
 		tp.EndRow()
 	}
 
diff --git a/pkg/cmd/gist/shared/shared.go b/pkg/cmd/gist/shared/shared.go
@@ -3,6 +3,7 @@ package shared
 import (
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/cli/cli/api"
 )
@@ -20,6 +21,8 @@ type Gist struct {
 	ID          string               `json:"id,omitempty"`
 	Description string               `json:"description"`
 	Files       map[string]*GistFile `json:"files"`
+	UpdatedAt   time.Time            `json:"updated_at"`
+	Public      bool
 }
 
 func GetGist(client *http.Client, hostname, gistID string) (*Gist, error) {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package shared`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"net/http"`
	`6`	`+ "time"`
`6`	`7`
`7`	`8`	`"github.com/cli/cli/api"`
`8`	`9`	`)`
`@@ -20,6 +21,8 @@ type Gist struct {`
`20`	`21`	ID string `json:"id,omitempty"`
`21`	`22`	Description string `json:"description"`
`22`	`23`	Files map[string]*GistFile `json:"files"`
	`24`	+ UpdatedAt time.Time `json:"updated_at"`
	`25`	`+ Public bool`
`23`	`26`	`}`
`24`	`27`
`25`	`28`	`func GetGist(client http.Client, hostname, gistID string) (Gist, error) {`