fix index.html mimetype bug,add overwrite checkbox;update build.sh;

Author: m2nlight

build.sh

@@ -12,77 +12,107 @@ GOOS_GOARCH_array=( aix_ppc64 android_386 android_amd64 android_arm android_arm6
 appname=`\basename $(\pwd)`
 outputpath=./bin
 package=''
+declare -i verbose=0
 
 until [ $# -eq 0 ]; do
 	case "$1" in
 	--help|-h)
-		echo "usage: bash ${0##*/} [--package|-p <package-name>] [--name|-n <app-name>] [--output|-o <output-path>]"
+		printf "usage: bash ${0##*/} [--verbose|-v] [--package|-p <package-name>] [--name|-n <app-name>] [--output|-o <output-path>]\n"
 		exit 0
 		;;
+  --verbose|-v)
+    verbose=1
+    ;;
 	--package|-n)
 		shift
 		if [ -z "$1" ] || [[ "$1" =~ ^\- ]]; then
-			echo "ERROR: package argument error: $1"
+			printf "ERROR: package argument error: $1\n"
 			exit 1
 		fi
 		package=$1
 		;;
 	--name|-n)
 		shift
 		if [ -z "$1" ] || [[ "$1" =~ ^\- ]]; then
-			echo "ERROR: name argument error: $1"
+			printf "ERROR: name argument error: $1\n"
 			exit 1
 		fi
 		appname=$1
 		;;
 	--output|-o)
 		shift
 		if [ -z "$1" ] || [[ "$1" =~ ^\- ]]; then
-			echo "ERROR: output argument error: $1"
+			printf "ERROR: output argument error: $1\n"
 			exit 1
 		fi
 		outputpath=$1
 		;;
 	*)
-		echo "ERROR: arguments error. please run \"bash ${0##*/} --help\" to get usage"
+		printf "ERROR: arguments error. please run \"bash ${0##*/} --help\" to get usage\n"
 		exit 1
 		;;
 	esac
 	shift
 done
 
 if [ -z "$appname" ]; then
-	echo "ERROR: please input an app-name by --name"
+	printf "ERROR: please input an app-name by --name\n"
 	exit 2
 fi
 
 if [ -z "$outputpath" ]; then
-	echo "ERROR: please input an output-path by --output"
+	printf "ERROR: please input an output-path by --output\n"
 	exit 2
 fi
 
-mkdir -p $outputpath
+mkdir -p "$outputpath"
 if [ $? -ne 0 ]; then
-	echo "ERROR: creating $outputpath failed: $?"
+	printf "ERROR: create $outputpath failed: $?\n"
 	exit 2
 fi
 
 cat << EOF
 Package: $package
 AppName: $appname
 Output: $outputpath
-
 EOF
 
+if [ ! -f go.mod ]; then
+  printf "\nCreating go.mod ...\n"
+  go mod init $appname
+  if [ $? -ne 0 ]; then
+    printf "Error: $?\n"
+    exit 2
+  fi
+fi
+
 declare -i count=${#GOOS_GOARCH_array[*]}
-declare -i num=1
+declare -i num=0
 for target in "${GOOS_GOARCH_array[@]}"; do
+	let num+=1
 	output=$outputpath/${appname}_${target}
-	if [ "${target%%_*}"="windows" ]; then
-		output="$output.exe"
-	fi
-	echo "($num/$count) building $output ..."
-	env GOOS=${target%%_*} GOARCH=${target##*_} go build -o $output $package
+  mygoos=${target%%_*}
+  mygoarch=${target##*_}
+  myverbose=''
+  mycgo=''
+  if [ $verbose -eq 1 ]; then
+    myverbose='-v'
+  fi
+  case "$mygoos" in
+    windows)
+		  output="$output.exe"
+      ;;
+    android)
+      mycgo='CGO_ENABLED=1'
+      ;;
+  esac
+	printf "\n($num/$count) Building $output ...\n"
+	env GOOS=$mygoos GOARCH=$mygoarch `printf "$mycgo"` go build $myverbose -ldflags "-s -w" -o $output $package
 	file $output
-	let num+=1
-done
+done
+
+if [ -t 1 ]; then
+	printf "\nDone. Press any key to exit..."
+	read -n1
+	printf "\n"
+fi

main.go

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/fatih/color"
 	"github.com/valyala/fasthttp"
@@ -19,7 +20,7 @@ import (
 
 const (
 	// Version information
-	Version = "SimpleHttpServer v1.3-beta.1"
+	Version = "SimpleHttpServer v1.3-beta.2"
 	// HTTPProxy returns HTTP_PROXY
 	HTTPProxy = "HTTP_PROXY"
 	// HTTPSProxy returns HTTPS_PROXY
@@ -289,6 +290,10 @@ func main() {
 			fs.PathNotFound = func(ctx *fasthttp.RequestCtx) {
 				fallbackpath := filepath.Join(v, config.Fallback)
 				if _, err := os.Stat(fallbackpath); err == nil {
+					mimeType := staticFileGetMimeType(filepath.Ext(fallbackpath))
+					if len(mimeType) > 0 {
+						ctx.SetContentType(mimeType)
+					}
 					ctx.SendFile(fallbackpath)
 				} else {
 					ctx.Error(fasthttp.StatusMessage(fasthttp.StatusNotFound), fasthttp.StatusNotFound)
@@ -341,6 +346,11 @@ func requestHandler(ctx *fasthttp.RequestCtx) {
 	}
 
 	// router
+	// log print
+	if config.Verbose {
+		statusCode := ctx.Response.StatusCode()
+		go logInfo(statusCode, "%d | %s | %s | %s\n", statusCode, ctx.RemoteIP(), ctx.Method(), ctx.Path())
+	}
 	switch string(ctx.Method()) {
 	case "POST":
 		switch string(ctx.Path()) {
@@ -359,12 +369,6 @@ func requestHandler(ctx *fasthttp.RequestCtx) {
 	default:
 		ctx.Error(fasthttp.StatusMessage(fasthttp.StatusNotFound), fasthttp.StatusNotFound)
 	}
-
-	// log print
-	if config.Verbose {
-		statusCode := ctx.Response.StatusCode()
-		go logInfo(statusCode, "%d | %s | %s | %s\n", statusCode, ctx.RemoteIP(), ctx.Method(), ctx.Path())
-	}
 }
 
 func fsHandler(ctx *fasthttp.RequestCtx) {
@@ -417,6 +421,10 @@ func dirHandler(path string, ctx *fasthttp.RequestCtx) bool {
 			indexfile := filepath.Join(localpath, v)
 			if fi, err := os.Stat(indexfile); err == nil {
 				if !fi.IsDir() {
+					mimeType := staticFileGetMimeType(filepath.Ext(indexfile))
+					if len(mimeType) > 0 {
+						ctx.SetContentType(mimeType)
+					}
 					ctx.SendFile(indexfile)
 					return true
 				}
@@ -446,6 +454,7 @@ func dirHandler(path string, ctx *fasthttp.RequestCtx) bool {
 				uploadhtml = fmt.Sprintf(`<form enctype="multipart/form-data" action="/upload" method="post">`+
 					`<input name="files[]" type="file" multiple>`+
 					`<input type="submit" value="Upload" onclick="this.disabled=true;this.value='Sending...';"/>`+
+					`<input type="checkbox" name="o" value="true">Overwrite`+
 					`<input type="hidden" id="r" name="r" value="%s">`+
 					`<input type="hidden" id="p" name="p" value="%s"></form>`,
 					ctx.RequestURI(), localpath)
@@ -488,6 +497,7 @@ func uploadHandle(ctx *fasthttp.RequestCtx) {
 	}
 
 	var uri, path string
+	isOverwrite := false
 	if r, ok := form.Value["r"]; ok && len(r) == 1 {
 		uri = r[0]
 	}
@@ -502,11 +512,36 @@ func uploadHandle(ctx *fasthttp.RequestCtx) {
 		ctx.Error(err.Error(), fasthttp.StatusInternalServerError)
 		return
 	}
+	if o, ok := form.Value["o"]; ok && len(o) == 1 {
+		isOverwrite = o[0] == "true"
+	}
 
 	for _, v := range form.File {
 		for _, header := range v {
 			fn := filepath.Join(path, header.Filename)
-			fasthttp.SaveMultipartFile(header, fn)
+			if !isOverwrite && fileOrDirIsExist(fn) {
+				for index := 1; index <= MaxInt; index++ {
+					ext := filepath.Ext(fn)
+					newfn := fmt.Sprintf("%s_%s_%d%s",
+						strings.TrimSuffix(fn, ext),
+						time.Now().Format("20060102150405"),
+						index,
+						ext)
+					if !fileOrDirIsExist(newfn) {
+						fn = newfn
+						break
+					}
+					if index == MaxInt {
+						ctx.Error("Sorry, can not create unique filename for "+fn, fasthttp.StatusInternalServerError)
+						return
+					}
+				}
+			}
+			logInfo(0, "%s | Saving file %s", ctx.RemoteIP(), fn)
+			err := fasthttp.SaveMultipartFile(header, fn)
+			if err != nil {
+				logInfo(fasthttp.StatusInternalServerError, "Save %s failed: %s", fn, err.Error())
+			}
 		}
 	}
 	ctx.Redirect(uri, fasthttp.StatusOK)
@@ -519,6 +554,13 @@ func dirIsExist(path string) bool {
 	return false
 }
 
+func fileOrDirIsExist(path string) bool {
+	if _, err := os.Stat(path); err == nil {
+		return true
+	}
+	return false
+}
+
 func basicAuth(ctx *fasthttp.RequestCtx) (username, password string, ok bool) {
 	auth := ctx.Request.Header.Peek("Authorization")
 	if auth == nil {