1、【新增功能】可以创建文件夹啦

2、【改进优化】启动时增加addr和dir两个参数，分别为监听的地址和选择公开的目录
3、【改进优化】文件后面加了下载按钮（直接点击文件会尽量在浏览器中打开）

Author: tskdsb

build.sh

@@ -0,0 +1,19 @@
+export CGO_ENABLED=0
+
+osS='
+linux
+windows
+'
+
+archS='
+amd64
+'
+
+for os in ${osS}; do
+  for arch in ${archS}; do
+    export GOOS=${os}
+    export GOARCH=${arch}
+    go build -o tskfs_${os}_${arch} main.go
+    chmod a+x tskfs_${os}_${arch}
+  done
+done

fileServer/fs.go

@@ -6,7 +6,6 @@ import (
   "fmt"
   "time"
   "html/template"
-  "log"
   "io"
   "path/filepath"
   "reflect"
@@ -47,10 +46,15 @@ const (
       {{range .}}
       <tr>
         <td>
-          <a href="/download?path={{$Path}}/{{.Name}}">{{dirSuffix .}}</a>
+          <a href="/download?path={{$Path}}/{{.Name}}&disposition=inline">{{dirSuffix .}}</a>
         </td>
         <td>{{humanSize .Size}}</td>
         <td>{{formatTime .ModTime}}</td>
+        {{if not (isDir .)}}
+        <td>
+          <a href="/download?path={{$Path}}/{{.Name}}&disposition=attachment">download</a>
+        </td>
+        {{end}}
       </tr>
       {{end}}
       {{end}}
@@ -63,6 +67,11 @@ const (
     <input type="file" name="upload">
     <input type="submit" value="upload">
   </form>
+  
+  <form action="/mkdir?path={{$Path}}" method="post" enctype="multipart/form-data">
+    <input type="text" name="mkdir">
+    <input type="submit" value="mkdir">
+  </form>
 
 </body>
 
@@ -71,13 +80,14 @@ const (
 )
 
 var (
-  ADDR      = ":80"
-  BASE_PATH = "."
+  ADDR      string
+  BASE_PATH string
 
   funcMap = template.FuncMap{
     "humanSize":  humanSize,
     "formatTime": formatTime,
     "dirSuffix":  dirSuffix,
+    "isDir":      isDir,
   }
 
   t = template.Must(template.New("TEMPLATE_LS").Funcs(funcMap).Parse(TEMPLATE_LS))
@@ -98,6 +108,9 @@ func dirSuffix(f os.FileInfo) string {
     return f.Name()
   }
 }
+func isDir(f os.FileInfo) bool {
+  return f.IsDir()
+}
 
 func humanSize(byteSize int64) string {
   var suffix = "B"
@@ -130,7 +143,7 @@ func formatTime(time time.Time) string {
   return time.Format("2006-01-02 15:04:05")
 }
 
-func download(w http.ResponseWriter, r *http.Request) {
+func Download(w http.ResponseWriter, r *http.Request) {
   path := filepath.Clean(r.FormValue("path"))
 
   file, err := os.Open(filepath.Join(BASE_PATH, path))
@@ -162,15 +175,16 @@ func download(w http.ResponseWriter, r *http.Request) {
   } else {
     //w.Header().Set("Content-Type", "text/plain; charset=utf-8")
     //w.Header().Set("Content-Type", "application/octet-stream; charset=utf-8")
-    w.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=\"%s\"", fileStat.Name()))
+    disposition := r.FormValue("disposition")
+    w.Header().Set("Content-Disposition", fmt.Sprintf("%s; filename=\"%s\"", disposition, fileStat.Name()))
     _, err := io.Copy(w, file)
     if err != nil {
       fmt.Fprintln(w, err)
     }
   }
 }
 
-func upload(w http.ResponseWriter, r *http.Request) {
+func Upload(w http.ResponseWriter, r *http.Request) {
   path := r.FormValue("path")
   file, fileHeader, err := r.FormFile("upload")
   if err != nil {
@@ -195,14 +209,27 @@ func upload(w http.ResponseWriter, r *http.Request) {
   http.Redirect(w, r, "/download?path="+path, http.StatusTemporaryRedirect)
 }
 
-func showRouterS(w http.ResponseWriter, r *http.Request) {
+func Mkdir(w http.ResponseWriter, r *http.Request) {
+  path := r.FormValue("path")
+  dir := r.FormValue("mkdir")
+  dirToMk := filepath.Join(BASE_PATH, path, dir)
+  err := os.MkdirAll(dirToMk, os.ModePerm)
+  if err != nil {
+    fmt.Fprintln(w, err)
+    return
+  }
+
+  http.Redirect(w, r, "/download?path="+path, http.StatusTemporaryRedirect)
+}
+
+func ShowRouterS(w http.ResponseWriter, r *http.Request) {
   mKeyS := reflect.ValueOf(http.DefaultServeMux).Elem().FieldByName("m").MapKeys()
   for p := range mKeyS {
     fmt.Fprintf(w, "<a href=\"%s\">%s</a><br />", mKeyS[p], mKeyS[p])
   }
 }
 
-func cmdLocal(w http.ResponseWriter, r *http.Request) {
+func CmdLocal(w http.ResponseWriter, r *http.Request) {
   data, err := ioutil.ReadAll(r.Body)
   if err != nil {
     fmt.Fprintln(w, err)
@@ -232,7 +259,7 @@ func cmdLocal(w http.ResponseWriter, r *http.Request) {
   fmt.Fprintf(w, "%s", resultJson)
 }
 
-func cmdSsh(w http.ResponseWriter, r *http.Request) {
+func CmdSsh(w http.ResponseWriter, r *http.Request) {
   data, err := ioutil.ReadAll(r.Body)
   if err != nil {
     fmt.Fprintln(w, err)
@@ -260,17 +287,3 @@ func cmdSsh(w http.ResponseWriter, r *http.Request) {
 
 func (h *TskHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
-
-func Start() {
-
-  http.HandleFunc("/", showRouterS)
-
-  http.HandleFunc("/download", download)
-  http.HandleFunc("/upload", upload)
-
-  http.HandleFunc("/cmd/local", cmdLocal)
-  http.HandleFunc("/cmd/ssh", cmdSsh)
-
-  log.Printf("\nwill listen on: %s\npath to expose: %s", ADDR, BASE_PATH)
-  log.Fatal(http.ListenAndServe(ADDR, nil))
-}

main.go

@@ -1,9 +1,27 @@
 package main
 
 import (
+  "net/http"
+  "log"
   "tskFileServer/fileServer"
+  "flag"
 )
 
 func main() {
-  fileServer.Start()
+
+  flag.StringVar(&fileServer.ADDR, "addr", "", "[ip:port], such as: 0.0.0.0:80")
+  flag.StringVar(&fileServer.BASE_PATH, "dir", ".", "Directory to expose, such as: /tmp/share")
+  flag.Parse()
+
+  http.HandleFunc("/", fileServer.ShowRouterS)
+
+  http.HandleFunc("/download", fileServer.Download)
+  http.HandleFunc("/upload", fileServer.Upload)
+  http.HandleFunc("/mkdir", fileServer.Mkdir)
+
+  http.HandleFunc("/cmd/local", fileServer.CmdLocal)
+  http.HandleFunc("/cmd/ssh", fileServer.CmdSsh)
+
+  log.Printf("\nwill listen on: %s\npath to expose: %s", fileServer.ADDR, fileServer.BASE_PATH)
+  log.Fatal(http.ListenAndServe(fileServer.ADDR, nil))
 }