ipfs · Jul 28, 2015 · Jul 28, 2015
Showing with 34 additions and 3 deletions.

+3 −3 cmd/ipfs/.gobuilder.yml

+12 −0 core/commands/get.go

+17 −0 thirdparty/tar/extractor.go

+2 −0 unixfs/tar/reader.go
diff --git a/cmd/ipfs/.gobuilder.yml b/cmd/ipfs/.gobuilder.yml
@@ -5,6 +5,6 @@ build_matrix:
     build_tags:
       - nofuse
 artifacts:
-  - dist/README.md
-  - dist/LICENSE
-  - dist/install.sh
+  README.md: dist/README.md
+  LICENSE: dist/LICENSE
+  install.sh: dist/install.sh
diff --git a/core/commands/get.go b/core/commands/get.go
@@ -130,6 +130,18 @@ may also specify the level of compression by specifying '-l=<1-9>'.
 
 		fmt.Printf("Saving file(s) to %s\n", outPath)
 
+		{
+
+			// consume the whole thing.
+			buf := make([]byte, 2048)
+			for {
+				_, err := outReader.Read(buf)
+				if err != nil {
+					panic(err.Error())
+				}
+			}
+		}
+
 		// TODO: get total length of files
 		bar := pb.New(0).SetUnits(pb.U_BYTES)
 		bar.Output = os.Stderr

diff --git a/thirdparty/tar/extractor.go b/thirdparty/tar/extractor.go
@@ -2,6 +2,7 @@ package tar
 
 import (
 	"archive/tar"
+	"fmt"
 	"io"
 	"os"
 	fp "path/filepath"
@@ -13,6 +14,20 @@ type Extractor struct {
 }
 
 func (te *Extractor) Extract(reader io.Reader) error {
+
+	// consume the whole thing.
+	buf := make([]byte, 2048)
+	for {
+		_, err := reader.Read(buf)
+		if err == io.EOF {
+			panic("eofed")
+			return nil
+		}
+		if err != nil {
+			return err
+		}
+	}
+
 	tarReader := tar.NewReader(reader)
 
 	// Check if the output path already exists, so we know whether we should
@@ -35,6 +50,8 @@ func (te *Extractor) Extract(reader io.Reader) error {
 			return err
 		}
 		if header == nil || err == io.EOF {
+			fmt.Println(header, err)
+			panic("ahhhhhhhh")
 			break
 		}
 

diff --git a/unixfs/tar/reader.go b/unixfs/tar/reader.go
@@ -29,6 +29,8 @@ type Reader struct {
 }
 
 func NewReader(ctx cxt.Context, path path.Path, dag mdag.DAGService, dagnode *mdag.Node, compression int) (*Reader, error) {
+	ctx, cancel := cxt.WithTimeout(ctx, time.Second)
+	defer cancel()
 
 	reader := &Reader{
 		signalChan: make(chan struct{}),