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-dms3
Commits
641c20b9
Commit
641c20b9
authored
9 years ago
by
W. Trevor King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core/coreunixs/add: Change add() to only accept a single reader
Catch up with core/commands/add.go.
parent
c322a4eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
core/coreunix/add.go
core/coreunix/add.go
+11
-12
No files found.
core/coreunix/add.go
View file @
641c20b9
...
...
@@ -86,24 +86,23 @@ func AddWrapped(n *core.IpfsNode, r io.Reader, filename string) (string, *merkle
return
gopath
.
Join
(
k
.
String
(),
filename
),
dagnode
,
nil
}
func
add
(
n
*
core
.
IpfsNode
,
reader
s
[]
io
.
Reader
)
(
[]
*
merkledag
.
Node
,
error
)
{
func
add
(
n
*
core
.
IpfsNode
,
reader
io
.
Reader
)
(
*
merkledag
.
Node
,
error
)
{
mp
,
ok
:=
n
.
Pinning
.
(
pin
.
ManualPinner
)
if
!
ok
{
return
nil
,
errors
.
New
(
"invalid pinner type! expected manual pinner"
)
}
dagnodes
:=
make
([]
*
merkledag
.
Node
,
0
)
for
_
,
reader
:=
range
readers
{
node
,
err
:=
importer
.
BuildDagFromReader
(
reader
,
n
.
DAG
,
mp
,
chunk
.
DefaultSplitter
)
if
err
!=
nil
{
return
nil
,
err
}
dagnodes
=
append
(
dagnodes
,
node
)
node
,
err
:=
importer
.
BuildDagFromReader
(
reader
,
n
.
DAG
,
mp
,
chunk
.
DefaultSplitter
)
if
err
!=
nil
{
return
nil
,
err
}
err
:=
n
.
Pinning
.
Flush
()
err
=
n
.
Pinning
.
Flush
()
if
err
!=
nil
{
return
nil
,
err
}
return
dagnodes
,
nil
return
node
,
nil
}
func
addNode
(
n
*
core
.
IpfsNode
,
node
*
merkledag
.
Node
)
error
{
...
...
@@ -125,12 +124,12 @@ func addFile(n *core.IpfsNode, file files.File) (*merkledag.Node, error) {
return
addDir
(
n
,
file
)
}
d
ns
,
err
:=
add
(
n
,
[]
io
.
Reader
{
file
}
)
d
agnode
,
err
:=
add
(
n
,
file
)
if
err
!=
nil
{
return
nil
,
err
}
return
dns
[
len
(
dns
)
-
1
],
nil
// last
dag
node
is the file.
return
dagnode
,
nil
}
func
addDir
(
n
*
core
.
IpfsNode
,
dir
files
.
File
)
(
*
merkledag
.
Node
,
error
)
{
...
...
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