X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=a11e03f04d0a398efd1c1d24f9437ea0142def0a;hb=099686a6455463aa6ccba141da1481c82fdb0cec;hp=f5a3918bc57e6bd1499f592d4afe834a09800dcb;hpb=6136ce6f002498cc98d9a3badac79f37fe74f80e;p=gocheese.git

diff --git a/gocheese.go b/gocheese.go
index f5a3918..a11e03f 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -100,10 +100,8 @@ func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
 
 func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string) bool {
 	if _, err := os.Stat(filepath.Join(*root, dir, InternalFlag)); err == nil {
-		log.Println(r.RemoteAddr, "pypi refresh skip, internal package", dir)
 		return true
 	}
-	log.Println(r.RemoteAddr, "pypi refresh", dir)
 	resp, err := http.Get(*pypiURL + dir + "/")
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadGateway)
@@ -205,7 +203,6 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
 }
 
 func listRoot(w http.ResponseWriter, r *http.Request) {
-	log.Println(r.RemoteAddr, "root")
 	files, err := ioutil.ReadDir(*root)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -227,7 +224,6 @@ func listRoot(w http.ResponseWriter, r *http.Request) {
 }
 
 func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh bool) {
-	log.Println(r.RemoteAddr, "dir", dir)
 	dirPath := filepath.Join(*root, dir)
 	if autorefresh {
 		if !refreshDir(w, r, dir, "") {
@@ -274,7 +270,7 @@ func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh boo
 }
 
 func servePkg(w http.ResponseWriter, r *http.Request, dir, filename string) {
-	log.Println(r.RemoteAddr, "pkg", filename)
+	log.Println(r.RemoteAddr, "get", filename)
 	path := filepath.Join(*root, dir, filename)
 	if _, err := os.Stat(path); os.IsNotExist(err) {
 		if !refreshDir(w, r, dir, filename) {
@@ -304,7 +300,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 	}
 	for _, file := range r.MultipartForm.File["content"] {
 		filename := file.Filename
-		log.Println(r.RemoteAddr, "upload", filename, "by", username)
+		log.Println(r.RemoteAddr, "put", filename, "by", username)
 		dir := filename[:strings.LastIndex(filename, "-")]
 		dirPath := filepath.Join(*root, dir)
 		path := filepath.Join(dirPath, filename)
@@ -363,7 +359,8 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 }
 
 func handler(w http.ResponseWriter, r *http.Request) {
-	if r.Method == "GET" {
+	switch r.Method {
+	case "GET":
 		var path string
 		var autorefresh bool
 		if strings.HasPrefix(r.URL.Path, *norefreshURLPath) {
@@ -387,8 +384,10 @@ func handler(w http.ResponseWriter, r *http.Request) {
 		} else {
 			servePkg(w, r, parts[0], parts[1])
 		}
-	} else if r.Method == "POST" {
+	case "POST":
 		serveUpload(w, r)
+	default:
+		http.Error(w, "unknown action", http.StatusBadRequest)
 	}
 }