make the tests pass!
Jeromy committed
Oct 4, 2014 at 06:34 UTC
11332fc73b4538412688a497b38bc151af33af3a
2 files changed
+11
-5
fuse/ipns/ipns_unix.go
+5
-3
@@ -282,7 +282,7 @@ func (s *Node) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) {
282
283
// ReadAll reads the object data as file data
284
func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) {
285
- log.Debug("ipns: ReadAll Node")
285
+ log.Debug("ipns: ReadAll [%s]", s.name)
286
r, err := mdag.NewDagReader(s.Nd, s.Ipfs.DAG)
287
if err != nil {
288
return nil, err
@@ -297,6 +297,7 @@ func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) {
297
if len(b) > 4 {
298
log.Debug("ReadAll trailing bytes: %v", b[len(b)-4:])
299
}
300
+ fmt.Println(b)
301
return b, nil
302
}
303
@@ -329,14 +330,14 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
330
newNode, err := imp.NewDagFromReader(buf)
331
if err != nil {
332
log.Critical("error creating dag from writerBuf: %s", err)
332
- return fuse.ENODATA
333
+ return err
334
}
335
if n.parent != nil {
336
err := n.parent.update(n.name, newNode)
337
if err != nil {
338
log.Critical("error in updating ipns dag tree: %s", err)
339
// return fuse.ETHISISPRETTYBAD
339
- return fuse.ENOSYS
340
+ return err
341
}
342
}
343
n.Nd = newNode
@@ -353,6 +354,7 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
354
fmt.Println("VERIFICATION READ")
355
fmt.Printf("READ %d BYTES\n", len(b))
356
fmt.Println(string(b))
357
+ fmt.Println(b)
358
//
359
360
n.writerBuf = nil
importer/importer.go
+6
-2
@@ -30,12 +30,14 @@ func NewDagFromReaderWithSplitter(r io.Reader, spl BlockSplitter) (*dag.Node, er
30
first := <-blkChan
31
root := &dag.Node{Data: dag.FilePBData(first)}
32
33
+ i := 0
34
for blk := range blkChan {
35
child := &dag.Node{Data: dag.WrapData(blk)}
35
- err := root.AddNodeLink("", child)
36
+ err := root.AddNodeLink(fmt.Sprintf("%d", i), child)
37
if err != nil {
38
return nil, err
39
}
40
+ i++
41
}
42
43
return root, nil
@@ -69,12 +71,14 @@ func NewDagInNode(r io.Reader, n *dag.Node) error {
71
first := <-blkChan
72
n.Data = dag.FilePBData(first)
73
74
+ i := 0
75
for blk := range blkChan {
76
child := &dag.Node{Data: dag.WrapData(blk)}
74
- err := n.AddNodeLink("", child)
77
+ err := n.AddNodeLink(fmt.Sprintf("%d", i), child)
78
if err != nil {
79
return err
80
}
81
+ i++
82
}
83
84
return nil