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
87ce7abe
Commit
87ce7abe
authored
9 years ago
by
Henry
Committed by
Juan Batiz-Benet
9 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
unixfs/io: added NewEmptyDirectory()
some golinting along the way
parent
31b83abf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
core/corehttp/gateway_handler.go
core/corehttp/gateway_handler.go
+2
-2
unixfs/io/dirbuilder.go
unixfs/io/dirbuilder.go
+10
-2
No files found.
core/corehttp/gateway_handler.go
View file @
87ce7abe
...
...
@@ -240,7 +240,7 @@ func (i *gatewayHandler) postHandler(w http.ResponseWriter, r *http.Request) {
}
func
(
i
*
gatewayHandler
)
putEmptyDirHandler
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
newnode
:=
uio
.
NewDirectory
(
i
.
node
.
DAG
)
.
GetNode
(
)
newnode
:=
uio
.
New
Empty
Directory
()
key
,
err
:=
i
.
node
.
DAG
.
Add
(
newnode
)
if
err
!=
nil
{
...
...
@@ -266,7 +266,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
var
newnode
*
dag
.
Node
if
pathext
[
len
(
pathext
)
-
1
]
==
'/'
{
newnode
=
uio
.
NewDirectory
(
i
.
node
.
DAG
)
.
GetNode
(
)
newnode
=
uio
.
New
Empty
Directory
()
}
else
{
newnode
,
err
=
i
.
newDagFromReader
(
r
.
Body
)
if
err
!=
nil
{
...
...
This diff is collapsed.
Click to expand it.
unixfs/io/dirbuilder.go
View file @
87ce7abe
...
...
@@ -15,15 +15,22 @@ type directoryBuilder struct {
dirnode
*
mdag
.
Node
}
// NewEmptyDirectory returns an empty merkledag Node with a folder Data chunk
func
NewEmptyDirectory
()
*
mdag
.
Node
{
return
&
mdag
.
Node
{
Data
:
format
.
FolderPBData
()}
}
// NewDirectory returns a directoryBuilder. It needs a DAGService to add the Children
func
NewDirectory
(
dserv
mdag
.
DAGService
)
*
directoryBuilder
{
db
:=
new
(
directoryBuilder
)
db
.
dserv
=
dserv
db
.
dirnode
=
new
(
mdag
.
Node
)
db
.
dirnode
.
Data
=
format
.
FolderPBData
()
db
.
dirnode
=
NewEmptyDirectory
()
return
db
}
// AddChild adds a (name, key)-pair to the root node.
func
(
d
*
directoryBuilder
)
AddChild
(
name
string
,
k
u
.
Key
)
error
{
// TODO(cryptix): consolidate context managment
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
TODO
(),
time
.
Minute
)
defer
cancel
()
...
...
@@ -40,6 +47,7 @@ func (d *directoryBuilder) AddChild(name string, k u.Key) error {
return
nil
}
// GetNode returns the root of this directoryBuilder
func
(
d
*
directoryBuilder
)
GetNode
()
*
mdag
.
Node
{
return
d
.
dirnode
}
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