shoopea/gowebdav
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Aaron Bieber 2017-10-05 09:07:33 -06:00 committed by Christoph Polcin
parent beeefa572c
commit 8a7d0f4982
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main/client.go
View File

@ -10,7 +10,7 @@ import (
"strings" "strings"
) )
func Fail(err interface{}) { func fail(err interface{}) {
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
} else { } else {
@ -50,7 +50,7 @@ func main() {
flag.Parse() flag.Parse()
if *root == "URL" { if *root == "URL" {
Fail(nil) fail(nil)
} }
M := strings.ToUpper(*m) M := strings.ToUpper(*m)
@ -58,7 +58,7 @@ func main() {
c := d.NewClient(*root, *usr, *pw) c := d.NewClient(*root, *usr, *pw)
if err := c.Connect(); err != nil { if err := c.Connect(); err != nil {
Fail(fmt.Sprintf("Failed to connect due to: %s", err.Error())) fail(fmt.Sprintf("Failed to connect due to: %s", err.Error()))
} }
alen := len(flag.Args()) alen := len(flag.Args())
if alen == 1 { if alen == 1 {
@ -117,7 +117,7 @@ func main() {
} }
default: default:
Fail(nil) fail(nil)
} }
} else if alen == 2 { } else if alen == 2 {
@ -141,7 +141,7 @@ func main() {
case "PUT", "PUSH", "WRITE": case "PUT", "PUSH", "WRITE":
stream, err := getStream(a1) stream, err := getStream(a1)
if err != nil { if err != nil {
Fail(err) fail(err)
} }
if err := c.WriteStream(a0, stream, 0644); err != nil { if err := c.WriteStream(a0, stream, 0644); err != nil {
fmt.Println(err) fmt.Println(err)
@ -150,10 +150,10 @@ func main() {
} }
default: default:
Fail(nil) fail(nil)
} }
} else { } else {
Fail(nil) fail(nil)
} }
} }
@ -161,16 +161,23 @@ func getStream(pathOrString string) (io.ReadCloser, error) {
fi, err := os.Stat(pathOrString) fi, err := os.Stat(pathOrString)
if err == nil { if err == nil {
if fi.IsDir() { if fi.IsDir() {
return nil, &os.PathError{"Open", pathOrString, errors.New("Path: '" + pathOrString + "' is a directory")} return nil, &os.PathError{
Op: "Open",
Path: pathOrString,
Err: errors.New("Path: '" + pathOrString + "' is a directory"),
}
} }
f, err := os.Open(pathOrString) f, err := os.Open(pathOrString)
if err == nil { if err == nil {
return f, nil return f, nil
} }
return nil, &os.PathError{"Open", pathOrString, err} return nil, &os.PathError{
} else { Op: "Open",
return nopCloser{strings.NewReader(pathOrString)}, nil Path: pathOrString,
Err: err,
} }
}
return nopCloser{strings.NewReader(pathOrString)}, nil
} }
type nopCloser struct { type nopCloser struct {