Showing progress now (#6)

go.mod

@@ -4,6 +4,7 @@ go 1.21.1
 
 require (
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
+	github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e
 	github.com/pkg/sftp v1.13.6
 	golang.org/x/crypto v0.13.0
 )

go.sum

@@ -5,6 +5,8 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e h1:Qa6dnn8DlasdXRnacluu8HzPts0S1I9zvvUPDbBnXFI=
+github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e/go.mod h1:waEya8ee1Ro/lgxpVhkJI4BVASzkm3UZqkx/cFJiYHM=
 github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo=
 github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

main.go

@@ -9,13 +9,21 @@ import (
 	"strings"
 
 	"github.com/docopt/docopt-go"
+	"github.com/mitchellh/ioprogress"
 	"github.com/pkg/sftp"
 	"golang.org/x/crypto/ssh"
 )
 
 var Version = "development"
 var usage string
 
+type cliOutput int
+
+const (
+	NoOutput cliOutput = iota
+	Text
+)
+
 func init() {
 	usage = `stockuploader
 
@@ -58,7 +66,7 @@ func main() {
 
 	// uploading files to sftp
 	for _, file := range files {
-		copyFile(client, file, path.Base(file))
+		copyFile(client, file, path.Base(file), Text)
 	}
 }
 
@@ -87,11 +95,10 @@ func initiateSftpConnection(user string, pass string, remote string, port string
 }
 
 // Copies file to remote host
-func copyFile(client *sftp.Client, source string, target string) {
-	fmt.Print(source)
+func copyFile(client *sftp.Client, source string, target string, output cliOutput) {
+
 	// Create destination file
 	dstFile, err := client.OpenFile(target, os.O_WRONLY|os.O_CREATE|os.O_TRUNC)
-	//dstFile, err := client.Create(target)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -103,12 +110,31 @@ func copyFile(client *sftp.Client, source string, target string) {
 		log.Fatal(err)
 	}
 
-	// Copy file
-	bytes, err := io.Copy(dstFile, srcFile)
-	if err != nil {
-		log.Fatal(err)
+	switch output {
+	case Text:
+		fmt.Println(source)
+		sourceFileSize, err := srcFile.Stat()
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		progressR := &ioprogress.Reader{
+			Reader: srcFile,
+			Size:   sourceFileSize.Size(),
+		}
+
+		// copy with progress
+		_, err = io.Copy(dstFile, progressR)
+		if err != nil {
+			log.Fatal(err)
+		}
+	default:
+		// copy silently
+		_, err = io.Copy(dstFile, srcFile)
+		if err != nil {
+			log.Fatal(err)
+		}
 	}
-	fmt.Printf("\t\t(successful with %d bytes)\n", bytes)
 }
 
 // Takes a comma separated string and returns a cleaned up slice

vendor/modules.txt

@@ -4,6 +4,9 @@ github.com/docopt/docopt-go
 # github.com/kr/fs v0.1.0
 ## explicit
 github.com/kr/fs
+# github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e
+## explicit
+github.com/mitchellh/ioprogress
 # github.com/pkg/sftp v1.13.6
 ## explicit; go 1.15
 github.com/pkg/sftp