Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
go-ipfs
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
ipfs
go-ipfs
Commits
87ce7abe
Commit
87ce7abe
authored
May 9, 2015
by
Henry
Committed by
Juan Batiz-Benet
May 10, 2015
Browse files
Options
Downloads
Patches
Plain Diff
unixfs/io: added NewEmptyDirectory()
some golinting along the way
parent
31b83abf
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/corehttp/gateway_handler.go
+2
-2
2 additions, 2 deletions
core/corehttp/gateway_handler.go
unixfs/io/dirbuilder.go
+10
-2
10 additions, 2 deletions
unixfs/io/dirbuilder.go
with
12 additions
and
4 deletions
core/corehttp/gateway_handler.go
+
2
−
2
View file @
87ce7abe
...
@@ -240,7 +240,7 @@ func (i *gatewayHandler) postHandler(w http.ResponseWriter, r *http.Request) {
...
@@ -240,7 +240,7 @@ func (i *gatewayHandler) postHandler(w http.ResponseWriter, r *http.Request) {
}
}
func
(
i
*
gatewayHandler
)
putEmptyDirHandler
(
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
)
key
,
err
:=
i
.
node
.
DAG
.
Add
(
newnode
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -266,7 +266,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
...
@@ -266,7 +266,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
var
newnode
*
dag
.
Node
var
newnode
*
dag
.
Node
if
pathext
[
len
(
pathext
)
-
1
]
==
'/'
{
if
pathext
[
len
(
pathext
)
-
1
]
==
'/'
{
newnode
=
uio
.
NewDirectory
(
i
.
node
.
DAG
)
.
GetNode
(
)
newnode
=
uio
.
New
Empty
Directory
()
}
else
{
}
else
{
newnode
,
err
=
i
.
newDagFromReader
(
r
.
Body
)
newnode
,
err
=
i
.
newDagFromReader
(
r
.
Body
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
This diff is collapsed.
Click to expand it.
unixfs/io/dirbuilder.go
+
10
−
2
View file @
87ce7abe
...
@@ -15,15 +15,22 @@ type directoryBuilder struct {
...
@@ -15,15 +15,22 @@ type directoryBuilder struct {
dirnode
*
mdag
.
Node
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
{
func
NewDirectory
(
dserv
mdag
.
DAGService
)
*
directoryBuilder
{
db
:=
new
(
directoryBuilder
)
db
:=
new
(
directoryBuilder
)
db
.
dserv
=
dserv
db
.
dserv
=
dserv
db
.
dirnode
=
new
(
mdag
.
Node
)
db
.
dirnode
=
NewEmptyDirectory
()
db
.
dirnode
.
Data
=
format
.
FolderPBData
()
return
db
return
db
}
}
// AddChild adds a (name, key)-pair to the root node.
func
(
d
*
directoryBuilder
)
AddChild
(
name
string
,
k
u
.
Key
)
error
{
func
(
d
*
directoryBuilder
)
AddChild
(
name
string
,
k
u
.
Key
)
error
{
// TODO(cryptix): consolidate context managment
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
TODO
(),
time
.
Minute
)
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
TODO
(),
time
.
Minute
)
defer
cancel
()
defer
cancel
()
...
@@ -40,6 +47,7 @@ func (d *directoryBuilder) AddChild(name string, k u.Key) error {
...
@@ -40,6 +47,7 @@ func (d *directoryBuilder) AddChild(name string, k u.Key) error {
return
nil
return
nil
}
}
// GetNode returns the root of this directoryBuilder
func
(
d
*
directoryBuilder
)
GetNode
()
*
mdag
.
Node
{
func
(
d
*
directoryBuilder
)
GetNode
()
*
mdag
.
Node
{
return
d
.
dirnode
return
d
.
dirnode
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment