core/commands2: Added preliminary 'add' command

core/commands2/add.go

+package commands
+
+import (
+	"fmt"
+	"io"
+
+	cmds "github.com/jbenet/go-ipfs/commands"
+	"github.com/jbenet/go-ipfs/core"
+	"github.com/jbenet/go-ipfs/importer"
+	dag "github.com/jbenet/go-ipfs/merkledag"
+)
+
+// Error indicating the max depth has been exceded.
+var ErrDepthLimitExceeded = fmt.Errorf("depth limit exceeded")
+
+var addCmd = &cmds.Command{
+	Options: []cmds.Option{
+		cmds.Option{[]string{"recursive", "r"}, cmds.Bool},
+	},
+	Arguments: []cmds.Argument{
+		cmds.Argument{"file", cmds.ArgFile, false, true},
+	},
+	Help: "TODO",
+	Run: func(res cmds.Response, req cmds.Request) {
+		n := req.Context().Node
+
+		// if recursive, set depth to reflect so
+		//opt, found := req.Option("r")
+		//if r, _ := opt.(bool); found && r {
+		//}
+
+		// add every path in args
+		for _, arg := range req.Arguments() {
+			// Add the file
+			node, err := add(n, arg.(io.Reader))
+			if err != nil {
+				res.SetError(err, cmds.ErrNormal)
+			}
+			fmt.Println(node.Key())
+		}
+	},
+}
+
+func add(n *core.IpfsNode, in io.Reader) (*dag.Node, error) {
+	node, err := importer.NewDagFromReader(in)
+	if err != nil {
+		return nil, err
+	}
+
+	// add the file to the graph + local storage
+	err = n.DAG.AddRecursive(node)
+	if err != nil {
+		return nil, err
+	}
+
+	// ensure we keep it
+	return node, n.Pinning.Pin(node, true)
+}

core/commands2/root.go

@@ -57,6 +57,7 @@ var rootSubcommands = map[string]*cmds.Command{
 	"ls":       lsCmd,
 	"commands": commandsCmd,
 	"publish":  publishCmd,
+	"add":      addCmd,
 
 	// test subcommands
 	// TODO: remove these when we don't need them anymore