Merge pull request git-lfs#180 from hawser/download-progress

Download progress

Author: technoweenie

commands/command_smudge.go

@@ -56,7 +56,7 @@ func smudgeCommand(cmd *cobra.Command, args []string) {
 		Error(err.Error())
 	}
 
-	err = ptr.Smudge(os.Stdout, cb)
+	err = ptr.Smudge(os.Stdout, filename, cb)
 	if file != nil {
 		file.Close()
 	}

hawser/client.go

@@ -227,7 +227,7 @@ func callPut(filehash, filename string, cb CopyCallback) *WrappedError {
 		Reader:    file,
 	}
 
-	bar := pb.StartNew(int(fileSize))
+	bar := pb.New64(fileSize)
 	bar.SetUnits(pb.U_BYTES)
 	bar.Start()
 

pointer/pointer.go

@@ -39,8 +39,8 @@ func NewPointer(oid string, size int64) *Pointer {
 	return &Pointer{latest, oid, size, oidType}
 }
 
-func (p *Pointer) Smudge(writer io.Writer, cb hawser.CopyCallback) error {
-	return Smudge(writer, p, cb)
+func (p *Pointer) Smudge(writer io.Writer, workingfile string, cb hawser.CopyCallback) error {
+	return Smudge(writer, p, workingfile, cb)
 }
 
 func (p *Pointer) Encode(writer io.Writer) (int, error) {

pointer/smudge.go

@@ -1,21 +1,23 @@
 package pointer
 
 import (
+	"fmt"
+	"github.com/cheggaaa/pb"
 	"github.com/hawser/git-hawser/hawser"
 	"github.com/technoweenie/go-contentaddressable"
 	"io"
 	"os"
 )
 
-func Smudge(writer io.Writer, ptr *Pointer, cb hawser.CopyCallback) error {
+func Smudge(writer io.Writer, ptr *Pointer, workingfile string, cb hawser.CopyCallback) error {
 	mediafile, err := hawser.LocalMediaPath(ptr.Oid)
 	if err != nil {
 		return err
 	}
 
 	var wErr *hawser.WrappedError
 	if stat, statErr := os.Stat(mediafile); statErr != nil || stat == nil {
-		wErr = downloadFile(writer, ptr, mediafile, cb)
+		wErr = downloadFile(writer, ptr, workingfile, mediafile, cb)
 	} else {
 		wErr = readLocalFile(writer, ptr, mediafile, cb)
 	}
@@ -27,7 +29,7 @@ func Smudge(writer io.Writer, ptr *Pointer, cb hawser.CopyCallback) error {
 	}
 }
 
-func downloadFile(writer io.Writer, ptr *Pointer, mediafile string, cb hawser.CopyCallback) *hawser.WrappedError {
+func downloadFile(writer io.Writer, ptr *Pointer, workingfile, mediafile string, cb hawser.CopyCallback) *hawser.WrappedError {
 	reader, size, wErr := hawser.Download(mediafile)
 	if reader != nil {
 		defer reader.Close()
@@ -47,6 +49,8 @@ func downloadFile(writer io.Writer, ptr *Pointer, mediafile string, cb hawser.Co
 		return hawser.Errorf(err, "Error opening media file buffer.")
 	}
 
+	fmt.Fprintf(os.Stderr, "Downloading %s (%s)\n", workingfile, pb.FormatBytes(ptr.Size))
+
 	_, err = hawser.CopyWithCallback(mediaFile, reader, ptr.Size, cb)
 	if err == nil {
 		err = mediaFile.Accept()