print a msg when downloading a file
This commit is contained in:
parent
255067846f
commit
3f1bd97cb4
@ -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()
|
||||
}
|
||||
|
@ -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 lfs.CopyCallback) error {
|
||||
return Smudge(writer, p, cb)
|
||||
func (p *Pointer) Smudge(writer io.Writer, workingfile string, cb lfs.CopyCallback) error {
|
||||
return Smudge(writer, p, workingfile, cb)
|
||||
}
|
||||
|
||||
func (p *Pointer) Encode(writer io.Writer) (int, error) {
|
||||
|
@ -1,6 +1,8 @@
|
||||
package pointer
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/cheggaaa/pb"
|
||||
"github.com/github/git-lfs/lfs"
|
||||
"github.com/technoweenie/go-contentaddressable"
|
||||
"io"
|
||||
@ -8,7 +10,7 @@ import (
|
||||
"path/filepath"
|
||||
)
|
||||
|
||||
func Smudge(writer io.Writer, ptr *Pointer, cb lfs.CopyCallback) error {
|
||||
func Smudge(writer io.Writer, ptr *Pointer, workingfile string, cb lfs.CopyCallback) error {
|
||||
mediafile, err := lfs.LocalMediaPath(ptr.Oid)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -16,7 +18,7 @@ func Smudge(writer io.Writer, ptr *Pointer, cb lfs.CopyCallback) error {
|
||||
|
||||
var wErr *lfs.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)
|
||||
}
|
||||
@ -28,12 +30,14 @@ func Smudge(writer io.Writer, ptr *Pointer, cb lfs.CopyCallback) error {
|
||||
}
|
||||
}
|
||||
|
||||
func downloadFile(writer io.Writer, ptr *Pointer, mediafile string, cb lfs.CopyCallback) *lfs.WrappedError {
|
||||
func downloadFile(writer io.Writer, ptr *Pointer, workingfile, mediafile string, cb lfs.CopyCallback) *lfs.WrappedError {
|
||||
reader, size, wErr := lfs.Download(filepath.Base(mediafile))
|
||||
if reader != nil {
|
||||
defer reader.Close()
|
||||
}
|
||||
|
||||
fmt.Fprintf(os.Stderr, "Downloading %s (%s)\n", workingfile, pb.FormatBytes(ptr.Size))
|
||||
|
||||
if wErr != nil {
|
||||
wErr.Errorf("Error downloading %s.", mediafile)
|
||||
return wErr
|
||||
|
Loading…
Reference in New Issue
Block a user