Merge pull request #225 from QuentinPerez/improve_cs

Improve _cs format

Author: moul

README.md

@@ -1132,6 +1132,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 ### master (unreleased)
 
+* Improve _cs format ([#223](https://github.com/scaleway/scaleway-cli/issues/223))
 * Use `gotty-client` instead of `termjs-cli`
 * Fix: bad detection of server already started when starting a server ([#224](https://github.com/scaleway/scaleway-cli/pull/224)) - [@arianvp](https://github.com/arianvp)
 * Added _cs ([#180](https://github.com/scaleway/scaleway-cli/issues/180))

pkg/cli/x_cs.go

@@ -4,7 +4,14 @@
 
 package cli
 
-import "fmt"
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/scaleway/scaleway-cli/vendor/github.com/dustin/go-humanize"
+)
 
 var cmdCS = &Command{
 	Exec:        runCS,
@@ -37,13 +44,28 @@ func runCS(cmd *Command, args []string) error {
 		if err != nil {
 			return fmt.Errorf("Unable to get your containers: %v", err)
 		}
-		printRawMode(cmd.Streams().Stdout, *containers)
+		for _, container := range containers.Containers {
+			fmt.Fprintf(cmd.Streams().Stdout, "s3://%s\n", container.Name)
+		}
 		return nil
 	}
-	datas, err := cmd.API.GetContainerDatas(args[0])
+	container := strings.Replace(args[0], "s3://", "", 1)
+	datas, err := cmd.API.GetContainerDatas(container)
 	if err != nil {
-		return fmt.Errorf("Unable to get your data from %s: %v", args[1], err)
+		return fmt.Errorf("Unable to get your data from %s: %v", container, err)
+	}
+	for _, data := range datas.Container {
+		t, err := time.Parse(time.RFC3339, data.LastModified)
+		if err != nil {
+			return err
+		}
+		year, month, day := t.Date()
+		hour, minute, _ := t.Clock()
+		size, err := strconv.Atoi(data.Size)
+		if err != nil {
+			return err
+		}
+		fmt.Fprintf(cmd.Streams().Stdout, "%-4d-%02d-%02d %02d:%02d %8s s3://%s/%s\n", year, month, day, hour, minute, humanize.Bytes(uint64(size)), container, data.Name)
 	}
-	printRawMode(cmd.Streams().Stdout, *datas)
 	return nil
 }

pkg/scwversion/version.go

@@ -1,6 +1,6 @@
 package scwversion
 
 var (
-	VERSION string
+	VERSION   string
 	GITCOMMIT string
 )

pkg/utils/utils.go

@@ -21,10 +21,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Sirupsen/logrus"
-	"github.com/moul/gotty-client"
 	"github.com/scaleway/scaleway-cli/pkg/sshcommand"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/moul/gotty-client"
 )
 
 // SpawnRedirection is used to redirects the fluxes