opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-19 01:39:35 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1404 from ipfs/feat/patch-path

Browse Source 
allow patch add-link to add at a path
This commit is contained in:
Jeromy Johnson
2015-06-19 22:01:57 -07:00
parent 09f16003d8 d585e20ebc
commit 7d254aef20
2 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
core/commands/object.go
View File

@ -602,36 +602,75 @@ func addLinkCaller(req cmds.Request, root *dag.Node) (key.Key, error) {
return "", err return "", err
} }
name := req.Arguments()[2] path := req.Arguments()[2]
childk := key.B58KeyDecode(req.Arguments()[3]) childk := key.B58KeyDecode(req.Arguments()[3])
newkey, err := addLink(req.Context().Context, nd.DAG, root, name, childk) parts := strings.Split(path, "/")
nnode, err := insertNodeAtPath(req.Context().Context, nd.DAG, root, parts, childk)
if err != nil { if err != nil {
return "", err return "", err
} }
return nnode.Key()
return newkey, nil
} }
func addLink(ctx context.Context, ds dag.DAGService, root *dag.Node, childname string, childk key.Key) (key.Key, error) { func addLink(ctx context.Context, ds dag.DAGService, root *dag.Node, childname string, childk key.Key) (*dag.Node, error) {
ctx, cancel := context.WithTimeout(ctx, time.Second*30) ctx, cancel := context.WithTimeout(ctx, time.Second*30)
childnd, err := ds.Get(ctx, childk) childnd, err := ds.Get(ctx, childk)
if err != nil { if err != nil {
cancel() cancel()
return "", err return nil, err
} }
cancel() cancel()
err = root.AddNodeLinkClean(childname, childnd) err = root.AddNodeLinkClean(childname, childnd)
if err != nil { if err != nil {
return "", err return nil, err
} }
newkey, err := ds.Add(root) _, err = ds.Add(root)
if err != nil { if err != nil {
return "", err return nil, err
} }
return newkey, nil return root, nil
}
func insertNodeAtPath(ctx context.Context, ds dag.DAGService, root *dag.Node, path []string, toinsert key.Key) (*dag.Node, error) {
if len(path) == 1 {
return addLink(ctx, ds, root, path[0], toinsert)
}
child, err := root.GetNodeLink(path[0])
if err != nil {
return nil, err
}
nd, err := child.GetNode(ctx, ds)
if err != nil {
return nil, err
}
ndprime, err := insertNodeAtPath(ctx, ds, nd, path[1:], toinsert)
if err != nil {
return nil, err
}
err = root.RemoveNodeLink(path[0])
if err != nil {
return nil, err
}
err = root.AddNodeLinkClean(path[0], ndprime)
if err != nil {
return nil, err
}
_, err = ds.Add(root)
if err != nil {
return nil, err
}
return root, nil
} }
func nodeFromTemplate(template string) (*dag.Node, error) { func nodeFromTemplate(template string) (*dag.Node, error) {

14
test/sharness/t0051-object.sh
View File

@ -100,6 +100,20 @@ test_object_cmd() {
OUTPUT=$(ipfs object patch $EMPTY_DIR add-link foo $EMPTY_DIR) OUTPUT=$(ipfs object patch $EMPTY_DIR add-link foo $EMPTY_DIR)
' '
test_expect_success "multilayer ipfs patch works" '
echo "hello world" > hwfile &&
FILE=$(ipfs add -q hwfile) &&
EMPTY=$(ipfs object new unixfs-dir) &&
ONE=$(ipfs object patch $EMPTY add-link b $EMPTY) &&
TWO=$(ipfs object patch $EMPTY add-link a $ONE) &&
ipfs object patch $TWO add-link a/b/c $FILE > multi_patch
'
test_expect_success "output looks good" '
ipfs cat $(cat multi_patch)/a/b/c > hwfile_out &&
test_cmp hwfile hwfile_out
'
test_expect_success "should have created dir within a dir" ' test_expect_success "should have created dir within a dir" '
ipfs ls $OUTPUT > patched_output ipfs ls $OUTPUT > patched_output
' '