opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-10-11 00:27:24 +08:00
Code Issues Projects Releases Wiki Activity

use makeCommand for publish + resolve

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-10-02 02:50:55 -07:00
parent 330ee8c79f
commit e91b2b8aec
2 changed files with 14 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
cmd/ipfs/publish.go
View File

@ -1,13 +1,9 @@
package main
import (
"os"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/gonuts/flag"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander"
"github.com/jbenet/go-ipfs/core/commands"
"github.com/jbenet/go-ipfs/daemon"
u "github.com/jbenet/go-ipfs/util"
)
var cmdIpfsPub = &commander.Command{
@ -24,35 +20,10 @@ func init() {
cmdIpfsPub.Flag.String("k", "", "Specify key to use for publishing.")
}
func pubCmd(c *commander.Command, inp []string) error {
if len(inp) < 1 {
u.POut(c.Long)
return nil
}
conf, err := getConfigDir(c.Parent)
if err != nil {
return err
}
cmd := daemon.NewCommand()
cmd.Command = "publish"
cmd.Args = inp
cmd.Opts["k"] = c.Flag.Lookup("k").Value.Get()
err = daemon.SendCommand(cmd, conf)
if err != nil {
u.DOut("Executing command locally.\n")
// Do locally
conf, err := getConfigDir(c.Parent)
if err != nil {
return err
}
n, err := localNode(conf, true)
if err != nil {
return err
}
return commands.Publish(n, cmd.Args, cmd.Opts, os.Stdout)
}
return nil
}
var pubCmd = makeCommand(command{
name: "publish",
args: 1,
flags: []string{"k"},
online: true,
cmdFn: commands.Publish,
})

42
cmd/ipfs/resolve.go
View File

@ -1,15 +1,9 @@
package main
import (
"fmt"
"os"
"time"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/gonuts/flag"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander"
"github.com/jbenet/go-ipfs/core/commands"
"github.com/jbenet/go-ipfs/daemon"
u "github.com/jbenet/go-ipfs/util"
)
var cmdIpfsResolve = &commander.Command{
@ -22,32 +16,10 @@ var cmdIpfsResolve = &commander.Command{
Flag: *flag.NewFlagSet("ipfs-resolve", flag.ExitOnError),
}
func resolveCmd(c *commander.Command, inp []string) error {
if len(inp) < 1 {
u.POut(c.Long)
return nil
}
conf, err := getConfigDir(c.Parent)
if err != nil {
return err
}
cmd := daemon.NewCommand()
cmd.Command = "resolve"
cmd.Args = inp
err = daemon.SendCommand(cmd, conf)
if err != nil {
now := time.Now()
// Resolve requires working DHT
n, err := localNode(conf, true)
if err != nil {
return err
}
took := time.Now().Sub(now)
fmt.Printf("localNode creation took %s\n", took.String())
return commands.Resolve(n, cmd.Args, cmd.Opts, os.Stdout)
}
return nil
}
var resolveCmd = makeCommand(command{
name: "resolve",
args: 1,
flags: nil,
online: true,
cmdFn: commands.Resolve,
})