Procházet zdrojové kódy

Run go fmt

Signed-off-by: Antoine Tenart <antoine.tenart@ack.tf>
Antoine Tenart před 5 roky
rodič
revize
91971b6750
1 změnil soubory, kde provedl 40 přidání a 18 odebrání
  1. 40 18
      main.go

+ 40 - 18
main.go

@@ -25,7 +25,7 @@ import (
 
 var (
 	version = "serve 0.2"
-	usage = `Temporary HTTP server to share local files
+	usage   = `Temporary HTTP server to share local files
 
 Usage:
   serve [options] [FILE]
@@ -41,7 +41,9 @@ Options:
 
 func outboundIP() net.IP {
 	c, err := net.Dial("udp", "8.8.8.8:80")
-	if err != nil { log.Fatal(err) }
+	if err != nil {
+		log.Fatal(err)
+	}
 	defer c.Close()
 
 	return c.LocalAddr().(*net.UDPAddr).IP
@@ -55,51 +57,68 @@ func main() {
 
 	f, _ := args["FILE"].(string)
 	f = path.Clean(f)
-	if f == "" { f = "." }
+	if f == "" {
+		f = "."
+	}
 
 	resource := path.Base(f)
 
 	fi, err := os.Stat(f)
-	if err != nil { log.Fatal(err) }
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	switch mode := fi.Mode(); {
 	case mode.IsRegular():
 		if limit, ok := args["--count"].(string); ok {
 			var err error
+
 			count, err = strconv.Atoi(limit)
-			if err != nil { log.Fatal(err) }
+			if err != nil {
+				log.Fatal(err)
+			}
+		}
+
+		if resource == "." {
+			resource = ""
 		}
 
-		if resource == "." { resource = "" }
 		handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			var extra string = ""
 			if count > 1 {
 				extra = fmt.Sprintf(", %d remaining GET",
-						    count - 1)
+					count-1)
 			}
 
 			client, _, err := net.SplitHostPort(r.RemoteAddr)
-			if err != nil { client = "unknown client" }
+			if err != nil {
+				client = "unknown client"
+			}
 			fmt.Printf("Connexion from %s requesting %s%s\n", client,
-				   r.URL.Path, extra)
+				r.URL.Path, extra)
 
 			if r.URL.Path != fmt.Sprintf("/%s", resource) {
 				http.Error(w, "File not found", 404)
 				return
 			}
-			if count > 0 { count-- }
+			if count > 0 {
+				count--
+			}
 
 			w.Header().Set("Content-Type", "application/octet-stream")
 			w.Header().Set("Content-Transfer-Encoding", "binary")
 			w.Header().Set("Content-Disposition",
-				       fmt.Sprintf("attachment; filename=%s", resource))
+				fmt.Sprintf("attachment; filename=%s", resource))
 			w.Header().Set("Content-Length",
-				       strconv.FormatInt(fi.Size(), 10))
+				strconv.FormatInt(fi.Size(), 10))
 			w.Header().Set("Cache-Control", "private")
 			w.Header().Set("Pragma", "private")
 			w.Header().Set("Expires", "0")
 
 			http.ServeFile(w, r, f)
-			if count == 0 { os.Exit(0) }
+			if count == 0 {
+				os.Exit(0)
+			}
 		})
 	case mode.IsDir():
 		resource = ""
@@ -108,13 +127,16 @@ func main() {
 		log.Fatal("Error: unsupported file type.")
 	}
 
-	uri := fmt.Sprintf("http://%s:%s/%s", outboundIP(),
-			   args["--port"].(string), resource)
+	uri := fmt.Sprintf("http://%s:%s/%s", outboundIP(), args["--port"].(string), resource)
 	fmt.Printf("Serving %s at %s\n", f, uri)
 
 	err = clipboard.WriteAll(uri)
-	if err != nil { log.Print(err) }
+	if err != nil {
+		log.Print(err)
+	}
 
-	err = http.ListenAndServe(":" + args["--port"].(string), handler)
-	if err != nil { log.Fatal(err) }
+	err = http.ListenAndServe(":"+args["--port"].(string), handler)
+	if err != nil {
+		log.Fatal(err)
+	}
 }