ipfs · Jan 23, 2016 · Jan 23, 2016
Showing with 121 additions and 9 deletions.

+103 −8 core/commands/files/files.go

+3 −1 namesys/routing.go

+15 −0 test/sharness/t0250-files-api.sh
diff --git a/core/commands/files/files.go b/core/commands/files/files.go
@@ -13,7 +13,10 @@ import (
 	core "github.com/ipfs/go-ipfs/core"
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	mfs "github.com/ipfs/go-ipfs/mfs"
+	namesys "github.com/ipfs/go-ipfs/namesys"
+	ci "github.com/ipfs/go-ipfs/p2p/crypto"
 	path "github.com/ipfs/go-ipfs/path"
+	offline "github.com/ipfs/go-ipfs/routing/offline"
 	ft "github.com/ipfs/go-ipfs/unixfs"
 
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
@@ -33,14 +36,15 @@ Files is an API for manipulating ipfs objects as if they were a unix filesystem.
 		cmds.BoolOption("f", "flush", "flush target and ancestors after write (default: true)"),
 	},
 	Subcommands: map[string]*cmds.Command{
-		"read":  FilesReadCmd,
-		"write": FilesWriteCmd,
-		"mv":    FilesMvCmd,
-		"cp":    FilesCpCmd,
-		"ls":    FilesLsCmd,
-		"mkdir": FilesMkdirCmd,
-		"stat":  FilesStatCmd,
-		"rm":    FilesRmCmd,
+		"read":    FilesReadCmd,
+		"write":   FilesWriteCmd,
+		"mv":      FilesMvCmd,
+		"cp":      FilesCpCmd,
+		"ls":      FilesLsCmd,
+		"mkdir":   FilesMkdirCmd,
+		"stat":    FilesStatCmd,
+		"rm":      FilesRmCmd,
+		"publish": FilesPublishCmd,
 	},
 }
 
@@ -613,6 +617,97 @@ Examples:
 	},
 }
 
+var FilesPublishCmd = &cmds.Command{
+	Helptext: cmds.HelpText{
+		Tagline: "publish a path to a specified ipns entry",
+		ShortDescription: `
+publish a file to ipns directly out of the files api
+
+   $ ipfs files publish /path/to/file
+   $ ipfs files publish --name=Qma3q5S8Eq1vCc1nSiPYNbSa1f2cH448sxdSnNR9nYoNoL /other/file
+`,
+	},
+	Arguments: []cmds.Argument{
+		cmds.StringArg("path", true, false, "path to entry to publish"),
+	},
+	Options: []cmds.Option{
+		cmds.StringOption("n", "name", "ipns name to publish to"),
+	},
+	Run: func(req cmds.Request, res cmds.Response) {
+		nd, err := req.InvocContext().GetNode()
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		if !nd.OnlineMode() {
+			err := nd.SetupOfflineRouting()
+			if err != nil {
+				res.SetError(err, cmds.ErrNormal)
+				return
+			}
+		}
+
+		local, _, _ := req.Option("local").Bool()
+		var publisher namesys.Publisher
+		if local {
+			offroute := offline.NewOfflineRouter(nd.Repo.Datastore(), nd.PrivateKey)
+			publisher = namesys.NewRoutingPublisher(offroute, nd.Repo.Datastore())
+		} else {
+			publisher = nd.Namesys
+		}
+
+		fpath, err := checkPath(req.Arguments()[0])
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		topub, err := mfs.Lookup(nd.FilesRoot, fpath)
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		dagnd, err := topub.GetNode()
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		ndkey, err := dagnd.Key()
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		name, found, err := req.Option("name").String()
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		if !found {
+			name = "local"
+		}
+
+		var key ci.PrivKey
+		switch name {
+		case "local":
+			key = nd.PrivateKey
+		default:
+			res.SetError(fmt.Errorf("keys other than your nodes ID key are not currently supported."), cmds.ErrNormal)
+			return
+		}
+
+		err = publisher.Publish(req.Context(), key, path.FromKey(ndkey))
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+	},
+}
+
 var FilesRmCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline: "remove a file",

diff --git a/namesys/routing.go b/namesys/routing.go
@@ -2,6 +2,7 @@ package namesys
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
@@ -117,14 +118,15 @@ func (r *routingResolver) ResolveN(ctx context.Context, name string, depth int)
 // resolve SFS-like names.
 func (r *routingResolver) resolveOnce(ctx context.Context, name string) (path.Path, error) {
 	log.Debugf("RoutingResolve: '%s'", name)
+	name = strings.TrimLeft(name, "/ipns/")
+
 	cached, ok := r.cacheGet(name)
 	if ok {
 		return cached, nil
 	}
 
 	hash, err := mh.FromB58String(name)
 	if err != nil {
-		// name should be a multihash. if it isn't, error out here.
 		log.Warningf("RoutingResolve: bad input hash: [%s]\n", name)
 		return "", err
 	}

diff --git a/test/sharness/t0250-files-api.sh b/test/sharness/t0250-files-api.sh
@@ -345,6 +345,21 @@ test_files_api() {
 		verify_dir_contents /cats/this
 	'
 
+	# test publish
+	test_expect_success "ipfs name publish works" '
+		ipfs files publish --local /cats/walrus
+	'
+
+	test_expect_success "ipns record looks good" '
+		ipfs name resolve --local > record_out
+	'
+
+	test_expect_success "record is correct" '
+		echo "/ipfs/QmNzVQoBR7wQjSNXFrcJHZ29PMsEDfF6iZB1QEhKD4uZpV" > record_exp &&
+		test_cmp record_exp record_out
+	'
+
+	# cleanup
 	test_expect_success "cleanup, remove 'cats'" '
 		ipfs files rm -r /cats
 	'