aboutsummaryrefslogtreecommitdiff
path: root/weed-fs/src/cmd/weed
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2013-01-17 00:15:05 -0800
committerChris Lu <chris.lu@gmail.com>2013-01-17 00:15:05 -0800
commitbf9c4ed033db62e45ae756a5dd3fd100a3ae8903 (patch)
tree584ddca2fc6c987daaa34cacf6512ae077c7e41f /weed-fs/src/cmd/weed
parentd1494ea786eae5816cb06e83f09142a234ccfb4f (diff)
downloadseaweedfs-bf9c4ed033db62e45ae756a5dd3fd100a3ae8903.tar.xz
seaweedfs-bf9c4ed033db62e45ae756a5dd3fd100a3ae8903.zip
Revert "add cmd/dump - a dumper"
This reverts commit 5d2a1e8d4845e7a7f1dccd962bb0ee6a5f9d6081.
Diffstat (limited to 'weed-fs/src/cmd/weed')
-rw-r--r--weed-fs/src/cmd/weed/command.go59
-rw-r--r--weed-fs/src/cmd/weed/shell.go73
-rw-r--r--weed-fs/src/cmd/weed/upload.go2
-rw-r--r--weed-fs/src/cmd/weed/weed.go4
4 files changed, 70 insertions, 68 deletions
diff --git a/weed-fs/src/cmd/weed/command.go b/weed-fs/src/cmd/weed/command.go
index 4d68ff151..8c725cafb 100644
--- a/weed-fs/src/cmd/weed/command.go
+++ b/weed-fs/src/cmd/weed/command.go
@@ -1,52 +1,53 @@
package main
import (
- "flag"
- "fmt"
- "os"
- "strings"
+ "flag"
+ "fmt"
+ "os"
+ "strings"
)
type Command struct {
- // Run runs the command.
- // The args are the arguments after the command name.
- Run func(cmd *Command, args []string) bool
+ // Run runs the command.
+ // The args are the arguments after the command name.
+ Run func(cmd *Command, args []string) bool
- // UsageLine is the one-line usage message.
- // The first word in the line is taken to be the command name.
- UsageLine string
+ // UsageLine is the one-line usage message.
+ // The first word in the line is taken to be the command name.
+ UsageLine string
- // Short is the short description shown in the 'go help' output.
- Short string
+ // Short is the short description shown in the 'go help' output.
+ Short string
- // Long is the long message shown in the 'go help <this-command>' output.
- Long string
+ // Long is the long message shown in the 'go help <this-command>' output.
+ Long string
+
+ // Flag is a set of flags specific to this command.
+ Flag flag.FlagSet
- // Flag is a set of flags specific to this command.
- Flag flag.FlagSet
}
// Name returns the command's name: the first word in the usage line.
func (c *Command) Name() string {
- name := c.UsageLine
- i := strings.Index(name, " ")
- if i >= 0 {
- name = name[:i]
- }
- return name
+ name := c.UsageLine
+ i := strings.Index(name, " ")
+ if i >= 0 {
+ name = name[:i]
+ }
+ return name
}
func (c *Command) Usage() {
- fmt.Fprintf(os.Stderr, "Example: weed %s\n", c.UsageLine)
- fmt.Fprintf(os.Stderr, "Default Usage:\n")
- c.Flag.PrintDefaults()
- fmt.Fprintf(os.Stderr, "Description:\n")
- fmt.Fprintf(os.Stderr, " %s\n", strings.TrimSpace(c.Long))
- os.Exit(2)
+ fmt.Fprintf(os.Stderr, "Example: weed %s\n", c.UsageLine)
+ fmt.Fprintf(os.Stderr, "Default Usage:\n")
+ c.Flag.PrintDefaults()
+ fmt.Fprintf(os.Stderr, "Description:\n")
+ fmt.Fprintf(os.Stderr, " %s\n", strings.TrimSpace(c.Long))
+ os.Exit(2)
}
// Runnable reports whether the command can be run; otherwise
// it is a documentation pseudo-command such as importpath.
func (c *Command) Runnable() bool {
- return c.Run != nil
+ return c.Run != nil
}
diff --git a/weed-fs/src/cmd/weed/shell.go b/weed-fs/src/cmd/weed/shell.go
index daf0b7e1f..78a4b9eb1 100644
--- a/weed-fs/src/cmd/weed/shell.go
+++ b/weed-fs/src/cmd/weed/shell.go
@@ -1,53 +1,54 @@
package main
import (
- "bufio"
- "fmt"
- "os"
+ "bufio"
+ "os"
+ "fmt"
)
func init() {
- cmdShell.Run = runShell // break init cycle
+ cmdShell.Run = runShell // break init cycle
}
var cmdShell = &Command{
- UsageLine: "shell",
- Short: "run interactive commands, now just echo",
- Long: `run interactive commands.
+ UsageLine: "shell",
+ Short: "run interactive commands, now just echo",
+ Long: `run interactive commands.
`,
}
-var ()
+var (
+)
func runShell(command *Command, args []string) bool {
- r := bufio.NewReader(os.Stdin)
- o := bufio.NewWriter(os.Stdout)
- e := bufio.NewWriter(os.Stderr)
- prompt := func() {
- o.WriteString("> ")
- o.Flush()
- }
- readLine := func() string {
- ret, err := r.ReadString('\n')
- if err != nil {
- fmt.Fprint(e, err)
- os.Exit(1)
- }
- return ret
- }
- execCmd := func(cmd string) int {
- if cmd != "" {
- o.WriteString(cmd)
- }
- return 0
- }
+ r := bufio.NewReader(os.Stdin)
+ o := bufio.NewWriter(os.Stdout)
+ e := bufio.NewWriter(os.Stderr)
+ prompt := func () {
+ o.WriteString("> ")
+ o.Flush()
+ };
+ readLine := func () string {
+ ret, err := r.ReadString('\n')
+ if err != nil {
+ fmt.Fprint(e,err);
+ os.Exit(1)
+ }
+ return ret
+ }
+ execCmd := func (cmd string) int {
+ if cmd != "" {
+ o.WriteString(cmd)
+ }
+ return 0
+ }
- cmd := ""
- for {
- prompt()
- cmd = readLine()
- execCmd(cmd)
- }
- return true
+ cmd := ""
+ for {
+ prompt()
+ cmd = readLine()
+ execCmd(cmd)
+ }
+ return true
}
diff --git a/weed-fs/src/cmd/weed/upload.go b/weed-fs/src/cmd/weed/upload.go
index 5707fda56..e25930b5d 100644
--- a/weed-fs/src/cmd/weed/upload.go
+++ b/weed-fs/src/cmd/weed/upload.go
@@ -67,7 +67,7 @@ func upload(filename string, server string, fid string) (int, error) {
}
ret, e := operation.Upload("http://"+server+"/"+fid, filename, fh)
if e != nil {
- return 0, e
+ return 0, e
}
return ret.Size, e
}
diff --git a/weed-fs/src/cmd/weed/weed.go b/weed-fs/src/cmd/weed/weed.go
index e2eb41ced..232520e75 100644
--- a/weed-fs/src/cmd/weed/weed.go
+++ b/weed-fs/src/cmd/weed/weed.go
@@ -175,9 +175,9 @@ func writeJson(w http.ResponseWriter, r *http.Request, obj interface{}) {
w.Header().Set("Content-Type", "application/javascript")
var bytes []byte
if r.FormValue("pretty") != "" {
- bytes, _ = json.MarshalIndent(obj, "", " ")
+ bytes, _ = json.MarshalIndent(obj, "", " ")
} else {
- bytes, _ = json.Marshal(obj)
+ bytes, _ = json.Marshal(obj)
}
callback := r.FormValue("callback")
if callback == "" {