package commands import ( "bytes" "errors" "fmt" "io" "io/ioutil" "os" "path/filepath" cmds "github.com/jbenet/go-ipfs/commands" core "github.com/jbenet/go-ipfs/core" internal "github.com/jbenet/go-ipfs/core/commands2/internal" importer "github.com/jbenet/go-ipfs/importer" "github.com/jbenet/go-ipfs/importer/chunk" dag "github.com/jbenet/go-ipfs/merkledag" pinning "github.com/jbenet/go-ipfs/pin" ft "github.com/jbenet/go-ipfs/unixfs" ) // Error indicating the max depth has been exceded. var ErrDepthLimitExceeded = fmt.Errorf("depth limit exceeded") type AddOutput struct { Objects []*Object Names []string } var addCmd = &cmds.Command{ Options: []cmds.Option{ cmds.BoolOption("recursive", "r", "Must be specified when adding directories"), }, Arguments: []cmds.Argument{ cmds.StringArg("file", true, true, "The path to a file to be added to IPFS"), }, Description: "Add an object to ipfs.", Help: `Adds contents of to ipfs. Use -r to add directories. Note that directories are added recursively, to form the ipfs MerkleDAG. A smarter partial add with a staging area (like git) remains to be implemented. `, Run: func(req cmds.Request) (interface{}, error) { var added AddOutput n := req.Context().Node recursive, err := req.Option("r").Bool() if err != nil { return nil, err } // THIS IS A HORRIBLE HACK -- FIXME!!! // see https://github.com/jbenet/go-ipfs/issues/309 // returns the last one addDagnode := func(name string, dn *dag.Node) error { o, err := getOutput(dn) if err != nil { return err } added.Objects = append(added.Objects, o) added.Names = append(added.Names, name) return nil } addFile := func(name string) (*dag.Node, error) { f, err := os.Open(name) if err != nil { return nil, err } defer f.Close() dns, err := add(n, []io.Reader{f}) if err != nil { return nil, err } log.Infof("adding file: %s", name) if err := addDagnode(name, dns[len(dns)-1]); err != nil { return nil, err } return dns[len(dns)-1], nil // last dag node is the file. } var addPath func(name string) (*dag.Node, error) addDir := func(name string) (*dag.Node, error) { tree := &dag.Node{Data: ft.FolderPBData()} entries, err := ioutil.ReadDir(name) if err != nil { return nil, err } // construct nodes for containing files. for _, e := range entries { fp := filepath.Join(name, e.Name()) nd, err := addPath(fp) if err != nil { return nil, err } if err = tree.AddNodeLink(e.Name(), nd); err != nil { return nil, err } } log.Infof("adding dir: %s", name) if err := addDagnode(name, tree); err != nil { return nil, err } return tree, nil } addPath = func(fpath string) (*dag.Node, error) { fi, err := os.Stat(fpath) if err != nil { return nil, err } if fi.IsDir() { if !recursive { return nil, errors.New("use -r to recursively add directories") } return addDir(fpath) } return addFile(fpath) } paths, err := internal.CastToStrings(req.Arguments()) if err != nil { panic(err) return nil, err } for _, f := range paths { if _, err := addPath(f); err != nil { return nil, err } } return added, nil // readers, err := internal.CastToReaders(req.Arguments()) // if err != nil { // return nil, err // } // // dagnodes, err := add(n, readers) // if err != nil { // return nil, err // } // // // TODO: include fs paths in output (will need a way to specify paths in underlying filearg system) // added := make([]*Object, 0, len(req.Arguments())) // for _, dagnode := range dagnodes { // object, err := getOutput(dagnode) // if err != nil { // return nil, err // } // // added = append(added, object) // } // // return &AddOutput{added}, nil }, Marshallers: map[cmds.EncodingType]cmds.Marshaller{ cmds.Text: func(res cmds.Response) ([]byte, error) { val, ok := res.Output().(*AddOutput) if !ok { return nil, errors.New("cast error") } var buf bytes.Buffer for i, obj := range val.Objects { buf.Write([]byte(fmt.Sprintf("added %s %s\n", obj.Hash, val.Names[i]))) } return buf.Bytes(), nil }, }, Type: &AddOutput{}, } func add(n *core.IpfsNode, readers []io.Reader) ([]*dag.Node, error) { mp, ok := n.Pinning.(pinning.ManualPinner) if !ok { return nil, errors.New("invalid pinner type! expected manual pinner") } dagnodes := make([]*dag.Node, 0) // TODO: allow adding directories (will need support for multiple files in filearg system) for _, reader := range readers { node, err := importer.BuildDagFromReader(reader, n.DAG, mp, chunk.DefaultSplitter) if err != nil { return nil, err } err = addNode(n, node) if err != nil { return nil, err } dagnodes = append(dagnodes, node) } return dagnodes, nil } func addNode(n *core.IpfsNode, node *dag.Node) error { err := n.DAG.AddRecursive(node) // add the file to the graph + local storage if err != nil { return err } err = n.Pinning.Pin(node, true) // ensure we keep it if err != nil { return err } return nil }