merge theme

support delete non-empty folder, close #97
update readme
2021-03-26 15:41:28 +08:00 · 2021-03-24 22:23:09 +08:00 · 2021-03-24 15:02:18 +08:00 · 2020-04-27 15:53:43 +08:00 · 2020-04-27 15:40:54 +08:00 · 2020-04-27 15:40:54 +08:00
8 changed files with 62 additions and 11 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ bindata_assetfs.go
 assets_vfsdata.go
 *.un~
 *.swp
+
+dist/
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -15,6 +15,7 @@ builds:
      - windows
    goarch:
      - amd64
+      - arm64
      - "386"
    goarm:
      - "6"
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 **Binaries** can be downloaded from [this repo releases](https://github.com/codeskyblue/gohttpserver/releases/)

 ## Requirements
-Tested with go-1.10, go-1.11
+Tested with go-1.16

 ## Screenshots
 ![screen](testdata/filetypes/gohttpserver.gif)
@@ -66,6 +66,12 @@ go build && ./gohttpserver

 Or download binaries from [github releases](https://github.com/codeskyblue/gohttpserver/releases)

+If you are using Mac, simply run command
+
+```bash
+brew install codeskyblue/tap/gohttpserver
+```
+
 ## Usage
 Listen on port 8000 of all interfaces, and enable file uploading.

--- a/assets/index.html
+++ b/assets/index.html
@@ -4,6 +4,7 @@
 <head>
  <meta charset="utf-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <meta name="theme-color" content="#000000">  
  <title>[[.Title]]</title>
  <link rel="shortcut icon" type="image/png" href="/-/assets/favicon.png" />
  <link rel="stylesheet" type="text/css" href="/-/assets/bootstrap-3.3.5/css/bootstrap.min.css">
@@ -256,7 +257,7 @@
    <div class="col-md-12">
      <div id="footer" class="pull-right" style="margin: 2em 1em">
        <a href="https://github.com/codeskyblue/gohttpserver">gohttpserver (ver:{{version}})</a>, written by <a href="https://github.com/codeskyblue">codeskyblue</a>.
-        Copyright 2016-2018. go1.10
+        Copyright 2016-2021. go1.16
      </div>
    </div>
  </div>
@@ -273,6 +274,11 @@
  <script src="/-/assets/bootstrap-3.3.5/js/bootstrap.min.js"></script>
  <script src='/-/assets/[["js/index.js" | urlhash ]]'></script>
  <!-- <script src="/-/assets/js/index.js"></script> -->
+  <!--Sync status bar color with border-color on mobile platforms.-->
+  <script>
+    var META = document.getElementsByTagName("meta");
+    META[2]["content"]=$('.navbar').css('border-color');
+  </script>
  [[if .GoogleTrackerID ]]
  <script>
    (function (i, s, o, g, r, a, m) {
@@ -292,4 +298,4 @@
  </script> [[ end ]]
 </body>

-</html>
+</html>
--- a/assets/themes/cyan.css
+++ b/assets/themes/cyan.css
@@ -0,0 +1,31 @@
+body {}
+
+td>a:hover {
+    color: #4cc0cf;
+    font-weight: normal;
+}
+
+td>a {
+    color: rgb(51, 51, 51);
+}
+
+a:hover {
+    font-weight: bold;
+}
+
+.navbar {
+    background-color: #00BCD4;
+    border-color: #0097A7;
+}
+
+.navbar .navbar-brand {
+    color: white;
+}
+
+.navbar {
+    border-radius: 0px;
+}
+
+.navbar-default ul.navbar-nav>li>a {
+    color: white;
+}
--- a/docker/push_manifest
+++ b/docker/push_manifest
@@ -9,8 +9,12 @@ fi

 set -ex

-sed -i '/experimental/d' $HOME/.docker/config.json
-sed -i '1a"experimental": "enabled",' $HOME/.docker/config.json
+if test $(uname) = "Linux"
+then
+	sed -i '/experimental/d' $HOME/.docker/config.json
+	sed -i '1a"experimental": "enabled",' $HOME/.docker/config.json
+fi
+
 docker manifest create codeskyblue/gohttpserver \
  codeskyblue/gohttpserver:latest \
  codeskyblue/gohttpserver:armhf
@@ -21,4 +25,4 @@ docker manifest annotate codeskyblue/gohttpserver \
 docker manifest push codeskyblue/gohttpserver

 # check again
-docker run mplatform/mquery codeskyblue/gohttpserver
+docker run mplatform/mquery codeskyblue/gohttpserver
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,7 @@
 module github.com/codeskyblue/gohttpserver

+go 1.16
+
 require (
 	github.com/alecthomas/kingpin v2.2.6+incompatible
 	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
@@ -23,5 +25,3 @@ require (
 	golang.org/x/tools v0.1.0 // indirect
 	howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect
 )
-
-go 1.13
--- a/httpstaticserver.go
+++ b/httpstaticserver.go
@@ -158,15 +158,16 @@ func (s *HTTPStaticServer) hMkdir(w http.ResponseWriter, req *http.Request) {
 }

 func (s *HTTPStaticServer) hDelete(w http.ResponseWriter, req *http.Request) {
-	// only can delete file now
 	path := mux.Vars(req)["path"]
+	path = filepath.Clean(path) // for safe reason, prevent path contain ..
 	auth := s.readAccessConf(path)
 	if !auth.canDelete(req) {
 		http.Error(w, "Delete forbidden", http.StatusForbidden)
 		return
 	}

-	err := os.Remove(filepath.Join(s.Root, path))
+	// TODO: path safe check
+	err := os.RemoveAll(filepath.Join(s.Root, path))
 	if err != nil {
 		pathErr, ok := err.(*os.PathError)
 		if ok {
@@ -232,7 +233,7 @@ func (s *HTTPStaticServer) hUploadOrMkdir(w http.ResponseWriter, req *http.Reque

 	// Large file (>32MB) will store in tmp directory
 	// The quickest operation is call os.Move instead of os.Copy
-	// Note: it seems not working well
+	// Note: it seems not working well, os.Rename might be failed

 	var copyErr error
 	// if osFile, ok := file.(*os.File); ok && fileExists(osFile.Name()) {
Author	SHA1	Message	Date
codeskyblue	42d1e077c9	merge theme	2021-03-26 15:41:28 +08:00
codeskyblue	b6200a88c0	support delete non-empty folder, close #97	2021-03-24 22:23:09 +08:00
codeskyblue	1618440f4f	update readme	2021-03-24 15:02:18 +08:00
hathlife	5367b9ea94	Update travis.yml	2020-04-27 15:53:43 +08:00
hathlife	8e275e27be	Edit README.	2020-04-27 15:40:54 +08:00
hathlife	56e184748f	Add Cyan theme.	2020-04-27 15:40:54 +08:00
hathlife	b40bf8101f	Sync status bar color with border-color on mobile platforms.	2020-04-27 15:40:30 +08:00
hathlife	70e364c57b	Use Go 1.14 & Update copyright string.	2020-03-25 21:21:36 +08:00