Commit 11332fc7 authored by Jeromy's avatar Jeromy

make the tests pass!

parent 7bb2bd6d
...@@ -282,7 +282,7 @@ func (s *Node) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) { ...@@ -282,7 +282,7 @@ func (s *Node) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) {
// ReadAll reads the object data as file data // ReadAll reads the object data as file data
func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) { func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) {
log.Debug("ipns: ReadAll Node") log.Debug("ipns: ReadAll [%s]", s.name)
r, err := mdag.NewDagReader(s.Nd, s.Ipfs.DAG) r, err := mdag.NewDagReader(s.Nd, s.Ipfs.DAG)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -297,6 +297,7 @@ func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) { ...@@ -297,6 +297,7 @@ func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) {
if len(b) > 4 { if len(b) > 4 {
log.Debug("ReadAll trailing bytes: %v", b[len(b)-4:]) log.Debug("ReadAll trailing bytes: %v", b[len(b)-4:])
} }
fmt.Println(b)
return b, nil return b, nil
} }
...@@ -329,14 +330,14 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error { ...@@ -329,14 +330,14 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
newNode, err := imp.NewDagFromReader(buf) newNode, err := imp.NewDagFromReader(buf)
if err != nil { if err != nil {
log.Critical("error creating dag from writerBuf: %s", err) log.Critical("error creating dag from writerBuf: %s", err)
return fuse.ENODATA return err
} }
if n.parent != nil { if n.parent != nil {
err := n.parent.update(n.name, newNode) err := n.parent.update(n.name, newNode)
if err != nil { if err != nil {
log.Critical("error in updating ipns dag tree: %s", err) log.Critical("error in updating ipns dag tree: %s", err)
// return fuse.ETHISISPRETTYBAD // return fuse.ETHISISPRETTYBAD
return fuse.ENOSYS return err
} }
} }
n.Nd = newNode n.Nd = newNode
...@@ -353,6 +354,7 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error { ...@@ -353,6 +354,7 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
fmt.Println("VERIFICATION READ") fmt.Println("VERIFICATION READ")
fmt.Printf("READ %d BYTES\n", len(b)) fmt.Printf("READ %d BYTES\n", len(b))
fmt.Println(string(b)) fmt.Println(string(b))
fmt.Println(b)
// //
n.writerBuf = nil n.writerBuf = nil
......
...@@ -30,12 +30,14 @@ func NewDagFromReaderWithSplitter(r io.Reader, spl BlockSplitter) (*dag.Node, er ...@@ -30,12 +30,14 @@ func NewDagFromReaderWithSplitter(r io.Reader, spl BlockSplitter) (*dag.Node, er
first := <-blkChan first := <-blkChan
root := &dag.Node{Data: dag.FilePBData(first)} root := &dag.Node{Data: dag.FilePBData(first)}
i := 0
for blk := range blkChan { for blk := range blkChan {
child := &dag.Node{Data: dag.WrapData(blk)} child := &dag.Node{Data: dag.WrapData(blk)}
err := root.AddNodeLink("", child) err := root.AddNodeLink(fmt.Sprintf("%d", i), child)
if err != nil { if err != nil {
return nil, err return nil, err
} }
i++
} }
return root, nil return root, nil
...@@ -69,12 +71,14 @@ func NewDagInNode(r io.Reader, n *dag.Node) error { ...@@ -69,12 +71,14 @@ func NewDagInNode(r io.Reader, n *dag.Node) error {
first := <-blkChan first := <-blkChan
n.Data = dag.FilePBData(first) n.Data = dag.FilePBData(first)
i := 0
for blk := range blkChan { for blk := range blkChan {
child := &dag.Node{Data: dag.WrapData(blk)} child := &dag.Node{Data: dag.WrapData(blk)}
err := n.AddNodeLink("", child) err := n.AddNodeLink(fmt.Sprintf("%d", i), child)
if err != nil { if err != nil {
return err return err
} }
i++
} }
return nil return nil
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment