forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

swarm: replaced subroutines with defer

Browse source
This commit is contained in:
nolash 2017-03-04 19:58:28 +01:00
parent 61b2ef3be8
commit 5841970c18
1 changed files with 15 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
cmd/swarm/upload.go
View file

@ -36,35 +36,6 @@ import (
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )
func cleanupAndDie(file *string, description string) {
if file != nil {
os.Remove(*file)
}
utils.Fatalf(description)
}
func swapStdin(f *os.File) (size int) {
b := make([]byte, 1024)
path := f.Name()
size = 0
r := io.TeeReader(os.Stdin, f)
for true {
n, err := r.Read(b)
if err == io.EOF {
break
} else if err != nil {
cleanupAndDie(&path, "STDIN read failed")
}
size += n
}
if size == 0 {
cleanupAndDie(&path, "STDIN zero length input")
}
return size
}
func upload(ctx *cli.Context) { func upload(ctx *cli.Context) {
args := ctx.Args() args := ctx.Args()
@ -80,17 +51,21 @@ func upload(ctx *cli.Context) {
var client = &client{api: bzzapi} var client = &client{api: bzzapi}
var entry manifestEntry var entry manifestEntry
var file string var file string
var cleanfile *string
if len(args) != 1 { if len(args) != 1 {
if fromStdin { if fromStdin {
f, err := ioutil.TempFile("", "swarm-stdin") tmp, err := ioutil.TempFile("", "swarm-stdin")
if err != nil { if err != nil {
utils.Fatalf("Could not create tempfile") utils.Fatalf("error create tempfile: %s", err)
} }
swapStdin(f) defer os.Remove(tmp.Name())
file = f.Name() n, err := io.Copy(tmp, os.Stdin)
cleanfile = &file if err != nil {
utils.Fatalf("error copying stdin to tempfile: %s", err)
} else if n == 0 {
utils.Fatalf("error reading from stdin: zero length")
}
file = tmp.Name()
} else { } else {
utils.Fatalf("Need filename as the first and only argument") utils.Fatalf("Need filename as the first and only argument")
} }
@ -100,29 +75,25 @@ func upload(ctx *cli.Context) {
fi, err := os.Stat(expandPath(file)) fi, err := os.Stat(expandPath(file))
if err != nil { if err != nil {
cleanupAndDie(cleanfile, fmt.Sprintf("Failed to stat file: %v", err)) utils.Fatalf("Failed to stat file: %v", err)
} }
if fi.IsDir() { if fi.IsDir() {
if !recursive { if !recursive {
cleanupAndDie(cleanfile, "Argument is a directory and recursive upload is disabled") utils.Fatalf("Argument is a directory and recursive upload is disabled")
} }
if !wantManifest { if !wantManifest {
cleanupAndDie(cleanfile, "Manifest is required for directory uploads") utils.Fatalf("Manifest is required for directory uploads")
} }
mhash, err := client.uploadDirectory(file, defaultPath) mhash, err := client.uploadDirectory(file, defaultPath)
if err != nil { if err != nil {
cleanupAndDie(cleanfile, fmt.Sprintf("Failed to upload directory: %v", err)) utils.Fatalf("Failed to upload directory: %v", err)
} }
fmt.Println(mhash) fmt.Println(mhash)
return return
} }
entry, err = client.uploadFile(file, fi, mimeType) entry, err = client.uploadFile(file, fi, mimeType)
if err != nil { if err != nil {
cleanupAndDie(cleanfile, fmt.Sprintf("Upload failed: %v", err)) utils.Fatalf("Upload failed: %v", err)
}
if cleanfile != nil {
os.Remove(file)
cleanfile = nil
} }
mroot := manifest{[]manifestEntry{entry}} mroot := manifest{[]manifestEntry{entry}}
if !wantManifest { if !wantManifest {