Update go-ipfs-files to 2.0

ipfs · Nov 24, 2018 · bff705f · bff705f
1 parent b4fd783
commit bff705f
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 23 deletions.
diff --git a/dag.go b/dag.go
@@ -39,9 +39,12 @@ func (s *Shell) DagPutWithOpts(data interface{}, opts ...options.DagPutOption) (
 	}
 
 	rc := ioutil.NopCloser(r)
-	fr := files.NewReaderFile("", "", rc, nil)
-	slf := files.NewSliceFile("", "", []files.File{fr})
-	fileReader := files.NewMultiFileReader(slf, true)
+	fr := files.NewReaderFile(rc, nil)
+	slf := files.NewSliceFile([]files.DirEntry{files.FileEntry("", fr)})
+	fileReader, err := files.NewMultiFileReader(slf, true)
+	if err != nil {
+		return "", err
+	}
 
 	var out struct {
 		Cid struct {

diff --git a/package.json b/package.json
@@ -51,9 +51,9 @@
     },
     {
       "author": "magik6k",
-      "hash": "QmZMWMvWMVKCbHetJ4RgndbuEF1io2UpUxwQwtNjtYPzSC",
+      "hash": "QmV22UjK6MYjyb4Zn5BtVg98wZWNiWK24paamYNgr9tLeX",
       "name": "go-ipfs-files",
-      "version": "1.0.1"
+      "version": "2.0.0"
     }
   ],
   "gxVersion": "0.7.0",

diff --git a/shell.go b/shell.go
@@ -158,9 +158,13 @@ func (s *Shell) AddWithOpts(r io.Reader, pin bool, rawLeaves bool) (string, erro
 	}
 
 	// handler expects an array of files
-	fr := files.NewReaderFile("", "", rc, nil)
-	slf := files.NewSliceFile("", "", []files.File{fr})
-	fileReader := files.NewMultiFileReader(slf, true)
+	fr := files.NewReaderFile(rc, nil)
+	slf := files.NewSliceFile([]files.DirEntry{files.FileEntry("", fr)})
+	fileReader, err := files.NewMultiFileReader(slf, true)
+	if err != nil {
+		return "", err
+	}
+
 
 	var out object
 	return out.Hash, s.Request("add").
@@ -172,9 +176,12 @@ func (s *Shell) AddWithOpts(r io.Reader, pin bool, rawLeaves bool) (string, erro
 }
 
 func (s *Shell) AddLink(target string) (string, error) {
-	link := files.NewLinkFile("", "", target, nil)
-	slf := files.NewSliceFile("", "", []files.File{link})
-	reader := files.NewMultiFileReader(slf, true)
+	link := files.NewLinkFile(target, nil)
+	slf := files.NewSliceFile([]files.DirEntry{files.FileEntry("", link)})
+	reader, err := files.NewMultiFileReader(slf, true)
+	if err != nil {
+		return "", err
+	}
 
 	var out object
 	return out.Hash, s.Request("add").Body(reader).Exec(context.Background(), &out)
@@ -187,12 +194,15 @@ func (s *Shell) AddDir(dir string) (string, error) {
 		return "", err
 	}
 
-	sf, err := files.NewSerialFile(path.Base(dir), dir, false, stat)
+	sf, err := files.NewSerialFile(dir, false, stat)
+	if err != nil {
+		return "", err
+	}
+	slf := files.NewSliceFile([]files.DirEntry{files.FileEntry(path.Base(dir), sf)})
+	reader, err := files.NewMultiFileReader(slf, true)
 	if err != nil {
 		return "", err
 	}
-	slf := files.NewSliceFile("", dir, []files.File{sf})
-	reader := files.NewMultiFileReader(slf, true)
 
 	resp, err := s.Request("add").
 		Option("recursive", true).
@@ -373,9 +383,13 @@ func (s *Shell) PatchData(root string, set bool, data interface{}) (string, erro
 		cmd = "set-data"
 	}
 
-	fr := files.NewReaderFile("", "", ioutil.NopCloser(read), nil)
-	slf := files.NewSliceFile("", "", []files.File{fr})
-	fileReader := files.NewMultiFileReader(slf, true)
+	rc := ioutil.NopCloser(read)
+	fr := files.NewReaderFile(rc, nil)
+	slf := files.NewSliceFile([]files.DirEntry{files.FileEntry("", fr)})
+	fileReader, err := files.NewMultiFileReader(slf, true)
+	if err != nil {
+		return "", err
+	}
 
 	var out object
 	return out.Hash, s.Request("object/patch/"+cmd, root).
@@ -477,9 +491,12 @@ func (s *Shell) BlockPut(block []byte, format, mhtype string, mhlen int) (string
 
 	data := bytes.NewReader(block)
 	rc := ioutil.NopCloser(data)
-	fr := files.NewReaderFile("", "", rc, nil)
-	slf := files.NewSliceFile("", "", []files.File{fr})
-	fileReader := files.NewMultiFileReader(slf, true)
+	fr := files.NewReaderFile(rc, nil)
+	slf := files.NewSliceFile([]files.DirEntry{files.FileEntry("", fr)})
+	fileReader, err := files.NewMultiFileReader(slf, true)
+	if err != nil {
+		return "", err
+	}
 
 	return out.Key, s.Request("block/put").
 		Option("mhtype", mhtype).
@@ -516,9 +533,12 @@ func (s *Shell) ObjectPut(obj *IpfsObject) (string, error) {
 
 	rc := ioutil.NopCloser(&data)
 
-	fr := files.NewReaderFile("", "", rc, nil)
-	slf := files.NewSliceFile("", "", []files.File{fr})
-	fileReader := files.NewMultiFileReader(slf, true)
+	fr := files.NewReaderFile(rc, nil)
+	slf := files.NewSliceFile([]files.DirEntry{files.FileEntry("", fr)})
+	fileReader, err := files.NewMultiFileReader(slf, true)
+	if err != nil {
+		return "", err
+	}
 
 	var out object
 	return out.Hash, s.Request("object/put").