issue 43 "go fmt" chagnes from "Ryan S. Brown" <sb@ryansb.com>

some basic changes to parse upload url

6 files changed, 26 insertions, 28 deletions

diff --git a/go/weed/export.go b/go/weed/export.go
index 23c0baf60..965a17699 100644
--- a/go/weed/export.go
+++ b/go/weed/export.go
@@ -3,9 +3,9 @@ package main
 import (
 	"archive/tar"
 	"bytes"
+	"code.google.com/p/weed-fs/go/glog"
 	"code.google.com/p/weed-fs/go/storage"
 	"fmt"
-	"code.google.com/p/weed-fs/go/glog"
 	"os"
 	"path"
 	"strconv"
diff --git a/go/weed/fix.go b/go/weed/fix.go
index 81b87eb18..e1cc63943 100644
--- a/go/weed/fix.go
+++ b/go/weed/fix.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"code.google.com/p/weed-fs/go/storage"
 	"code.google.com/p/weed-fs/go/glog"
+	"code.google.com/p/weed-fs/go/storage"
 	"os"
 	"path"
 	"strconv"
diff --git a/go/weed/master.go b/go/weed/master.go
index 2d7adef1f..7aa48e59c 100644
--- a/go/weed/master.go
+++ b/go/weed/master.go
@@ -182,7 +182,7 @@ func volumeStatusHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func redirectHandler(w http.ResponseWriter, r *http.Request) {
-	vid, _, _, _ := parseURLPath(r.URL.Path)
+	vid, _, _, _, _ := parseURLPath(r.URL.Path)
 	volumeId, err := storage.NewVolumeId(vid)
 	if err != nil {
 		debug("parsing error:", err, r.URL.Path)
diff --git a/go/weed/shell.go b/go/weed/shell.go
index 14c84a5d1..885a0fa71 100644
--- a/go/weed/shell.go
+++ b/go/weed/shell.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"bufio"
-	"fmt"
 	"code.google.com/p/weed-fs/go/glog"
+	"fmt"
 	"os"
 )
 
diff --git a/go/weed/volume.go b/go/weed/volume.go
index 3c4db7ff1..cf58af799 100644
--- a/go/weed/volume.go
+++ b/go/weed/volume.go
@@ -118,7 +118,7 @@ func storeHandler(w http.ResponseWriter, r *http.Request) {
 }
 func GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool) {
 	n := new(storage.Needle)
-	vid, fid, filename, ext := parseURLPath(r.URL.Path)
+	vid, fid, filename, ext, _ := parseURLPath(r.URL.Path)
 	volumeId, err := storage.NewVolumeId(vid)
 	if err != nil {
 		debug("parsing error:", err, r.URL.Path)
@@ -207,7 +207,7 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
 		writeJsonError(w, r, e)
 		return
 	}
-	vid, _, _, _ := parseURLPath(r.URL.Path)
+	vid, _, _, _, _ := parseURLPath(r.URL.Path)
 	volumeId, ve := storage.NewVolumeId(vid)
 	if ve != nil {
 		debug("NewVolumeId error:", ve)
@@ -231,7 +231,7 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
 }
 func DeleteHandler(w http.ResponseWriter, r *http.Request) {
 	n := new(storage.Needle)
-	vid, fid, _, _ := parseURLPath(r.URL.Path)
+	vid, fid, _, _, _ := parseURLPath(r.URL.Path)
 	volumeId, _ := storage.NewVolumeId(vid)
 	n.ParsePath(fid)
 
@@ -266,7 +266,7 @@ func DeleteHandler(w http.ResponseWriter, r *http.Request) {
 	writeJsonQuiet(w, r, m)
 }
 
-func parseURLPath(path string) (vid, fid, filename, ext string) {
+func parseURLPath(path string) (vid, fid, filename, ext string, isVolumeIdOnly bool) {
 	switch strings.Count(path, "/") {
 	case 3:
 		parts := strings.Split(path, "/")
@@ -284,9 +284,7 @@ func parseURLPath(path string) (vid, fid, filename, ext string) {
 		sepIndex := strings.LastIndex(path, "/")
 		commaIndex := strings.LastIndex(path[sepIndex:], ",")
 		if commaIndex <= 0 {
-			if "favicon.ico" != path[sepIndex+1:] {
-				glog.V(0).Infoln("unknown file id", path[sepIndex+1:])
-			}
+			vid, isVolumeIdOnly = path[sepIndex+1:], true
 			return
 		}
 		dotIndex := strings.LastIndex(path[sepIndex:], ".")
diff --git a/go/weed/weed.go b/go/weed/weed.go
index dc74b7650..e9bc4e37d 100644
--- a/go/weed/weed.go
+++ b/go/weed/weed.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 	"math/rand"
-  "net"
+	"net"
 	"net/http"
 	"os"
 	"strings"
@@ -225,20 +225,20 @@ func debug(params ...interface{}) {
 	}
 }
 func secure(whiteList []string, f func(w http.ResponseWriter, r *http.Request)) func(w http.ResponseWriter, r *http.Request) {
-  return func(w http.ResponseWriter, r *http.Request) {
-    if len(whiteList) == 0 {
-      f(w, r)
-      return
-    }
-    host, _, err := net.SplitHostPort(r.RemoteAddr)
-    if err == nil {
-      for _, ip := range whiteList {
-        if ip == host {
-          f(w, r)
-          return
-        }
-      }
-    }
-    writeJsonQuiet(w, r, map[string]interface{}{"error": "No write permisson from " + host})
-  }
+	return func(w http.ResponseWriter, r *http.Request) {
+		if len(whiteList) == 0 {
+			f(w, r)
+			return
+		}
+		host, _, err := net.SplitHostPort(r.RemoteAddr)
+		if err == nil {
+			for _, ip := range whiteList {
+				if ip == host {
+					f(w, r)
+					return
+				}
+			}
+		}
+		writeJsonQuiet(w, r, map[string]interface{}{"error": "No write permisson from " + host})
+	}
 }