Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-unixfs
Commits
11332fc7
Commit
11332fc7
authored
10 years ago
by
Jeromy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make the tests pass!
parent
7bb2bd6d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
fuse/ipns/ipns_unix.go
fuse/ipns/ipns_unix.go
+5
-3
importer/importer.go
importer/importer.go
+6
-2
No files found.
fuse/ipns/ipns_unix.go
View file @
11332fc7
...
...
@@ -282,7 +282,7 @@ func (s *Node) ReadDir(intr fs.Intr) ([]fuse.Dirent, fuse.Error) {
// ReadAll reads the object data as file data
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
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -297,6 +297,7 @@ func (s *Node) ReadAll(intr fs.Intr) ([]byte, fuse.Error) {
if
len
(
b
)
>
4
{
log
.
Debug
(
"ReadAll trailing bytes: %v"
,
b
[
len
(
b
)
-
4
:
])
}
fmt
.
Println
(
b
)
return
b
,
nil
}
...
...
@@ -329,14 +330,14 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
newNode
,
err
:=
imp
.
NewDagFromReader
(
buf
)
if
err
!=
nil
{
log
.
Critical
(
"error creating dag from writerBuf: %s"
,
err
)
return
fuse
.
ENODATA
return
err
}
if
n
.
parent
!=
nil
{
err
:=
n
.
parent
.
update
(
n
.
name
,
newNode
)
if
err
!=
nil
{
log
.
Critical
(
"error in updating ipns dag tree: %s"
,
err
)
// return fuse.ETHISISPRETTYBAD
return
fuse
.
ENOSYS
return
err
}
}
n
.
Nd
=
newNode
...
...
@@ -353,6 +354,7 @@ func (n *Node) Flush(req *fuse.FlushRequest, intr fs.Intr) fuse.Error {
fmt
.
Println
(
"VERIFICATION READ"
)
fmt
.
Printf
(
"READ %d BYTES
\n
"
,
len
(
b
))
fmt
.
Println
(
string
(
b
))
fmt
.
Println
(
b
)
//
n
.
writerBuf
=
nil
...
...
This diff is collapsed.
Click to expand it.
importer/importer.go
View file @
11332fc7
...
...
@@ -30,12 +30,14 @@ func NewDagFromReaderWithSplitter(r io.Reader, spl BlockSplitter) (*dag.Node, er
first
:=
<-
blkChan
root
:=
&
dag
.
Node
{
Data
:
dag
.
FilePBData
(
first
)}
i
:=
0
for
blk
:=
range
blkChan
{
child
:=
&
dag
.
Node
{
Data
:
dag
.
WrapData
(
blk
)}
err
:=
root
.
AddNodeLink
(
""
,
child
)
err
:=
root
.
AddNodeLink
(
fmt
.
Sprintf
(
"%d"
,
i
)
,
child
)
if
err
!=
nil
{
return
nil
,
err
}
i
++
}
return
root
,
nil
...
...
@@ -69,12 +71,14 @@ func NewDagInNode(r io.Reader, n *dag.Node) error {
first
:=
<-
blkChan
n
.
Data
=
dag
.
FilePBData
(
first
)
i
:=
0
for
blk
:=
range
blkChan
{
child
:=
&
dag
.
Node
{
Data
:
dag
.
WrapData
(
blk
)}
err
:=
n
.
AddNodeLink
(
""
,
child
)
err
:=
n
.
AddNodeLink
(
fmt
.
Sprintf
(
"%d"
,
i
)
,
child
)
if
err
!=
nil
{
return
err
}
i
++
}
return
nil
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment