parsing HTML directly from string instead of index.html,

resizing QRCode,
added new sample gifs,
created github release for distributing the binary

Author: prdpx7

.gitignore

@@ -29,3 +29,8 @@ _testmain.go
 
 # external packages folder
 vendor/
+
+MD5SUMS
+SHA512SUMS
+*.tar.gz
+fs-server/fs-server

README.md

@@ -1,14 +1,30 @@
 # go-fileserver
-> A simple HTTP server to share files over same wifi via QRCode
+> A simple HTTP file server to share files over WiFi via QRCode
 
 # Installation
-```
-git clone https://github.com/prdpx7/go-fileserver
-cd go-fileserver/fs-server
-go build
-# now just run the binary
-./fs-server
-```
+* You can download compressed version from [releases](https://github.com/prdpx7/go-fileserver/releases)
+    ```
+    wget https://github.com/prdpx7/go-fileserver/releases/download/v0.1/fs-server-2020.07.25.tar.gz
+    tar -xzf fs-server-2020.07.25.tar.gz
+	chmod +x fs-server && sudo cp fs-server /usr/local/bin/fs-server
+    ```
+* Or download the binary directly
+	```
+	wget https://github.com/prdpx7/go-fileserver/releases/download/v0.1/fs-server
+	chmod +x fs-server && sudo cp fs-server /usr/local/bin/fs-server
+	```
+
+* Or you can clone from GitHub and build the binary yourself
+	```
+	git clone https://github.com/prdpx7/go-fileserver --depth=1
+	cd go-fileserver/fs-server
+	# requires go 1.14
+	go build
+	# make binary executable
+	chmod +x ./fs-server
+	# may require root permission
+	cp fs-server /usr/local/bin/fs-server
+	```
 # Usage
 ```
 fs-server - A simple HTTP Server to share files on a network.
@@ -20,4 +36,15 @@ fs-server - serve files from current directory
 fs-server /home/user/documents/ - serve files from given directory
 ```
 # Demo
-<img src ="./fs-server.gif">
+
+### Step 1 - Run in terminal
+<img src ="./fs-server_cli.gif" width=800 height=500>
+
+### Step 2 - Scan QRCode on Phone
+<img src="./fs-server_mobile.gif" width=350 height=700>
+
+# Inspiration
+* Inspired from [http-server](https://github.com/http-party/http-server) project
+
+# Licence
+* MIT

fileserver.go

@@ -20,6 +20,7 @@ type customFileHandler struct {
 	root http.FileSystem
 }
 
+//CustomFileServer ...
 func CustomFileServer(root http.FileSystem) http.Handler {
 	return &customFileHandler{root}
 }
@@ -31,11 +32,11 @@ func (cf *customFileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		r.URL.Path = upath
 	}
 
-	ServeFile(w, r, cf.root, path.Clean(upath), true)
+	ServeFile(w, r, cf.root, path.Clean(upath), true, "")
 }
 
 // ServeFile ...
-func ServeFile(w http.ResponseWriter, r *http.Request, fs http.FileSystem, name string, redirect bool) {
+func ServeFile(w http.ResponseWriter, r *http.Request, fs http.FileSystem, name string, redirect bool, templateName string) {
 	f, err := fs.Open(name)
 	if err != nil {
 		msg, code := toHTTPError(err)
@@ -50,8 +51,9 @@ func ServeFile(w http.ResponseWriter, r *http.Request, fs http.FileSystem, name
 		http.Error(w, msg, code)
 		return
 	}
+
 	if d.IsDir() {
-		ListDirectory(w, r, f, "index")
+		ListDirectory(w, r, f, templateName)
 		return
 	}
 	http.ServeContent(w, r, d.Name(), d.ModTime(), f)
@@ -68,6 +70,7 @@ func toHTTPError(err error) (msg string, httpStatus int) {
 	return "500 Internal Server Error", http.StatusInternalServerError
 }
 
+
 //ListDirectory render directory content in templateName.html
 func ListDirectory(w http.ResponseWriter, r *http.Request, f http.File, templateName string) {
 	RootDir, err := f.Stat()
@@ -90,7 +93,7 @@ func ListDirectory(w http.ResponseWriter, r *http.Request, f http.File, template
 		fileExtension := "page"
 		if d.IsDir() {
 			name += "/"
-			fileExtension = "directory"
+			fileExtension = "folder"
 		} else if len(filepath.Ext(name)) > 1 {
 			fileExtension = filepath.Ext(name)[1:]
 		}
@@ -119,15 +122,26 @@ type FileContent struct {
 }
 
 func renderTemplate(w http.ResponseWriter, tmpl string, data interface{}) {
-	t, err := template.ParseFiles(tmpl + ".html")
+	var t *template.Template
+	var err error
+	// use default rendering html
+	if len(tmpl) == 0 {
+		t = template.New("index")
+		t, err = t.Parse(utils.DirListTemplateHTML)
+	} else {
+		templatePath, _ := filepath.Abs(tmpl + ".html")
+		fmt.Println("template path", templatePath)
+		t, err = template.ParseFiles(templatePath)
+	}
+
 	if err != nil {
 		fmt.Println("Error in parsing template ",err)
 		panic(err)
 	}
 	t.Execute(w, data)
 }
 
-//RequestLogger
+//RequestLogger ...
 func RequestLogger(handler http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		log.Printf("%s %s %s\n", r.RemoteAddr, r.Method, r.URL)

fs-server.gif

@@ -25,8 +25,7 @@ func main() {
 		fmt.Printf(url)
 		qr, _ := qrcode.New(url, qrcode.High)
 		// qr.DisableBorder = true
-		art := qr.ToString(false)
-		fmt.Println(art)
+		fmt.Println(qr.ToSmallString(false))
 	}
 
 	fs := fileserver.CustomFileServer(http.Dir(dirpath))

fs-server/fs-server

@@ -2,4 +2,10 @@ module github.com/prdpx7/go-fileserver
 
 go 1.14
 
-require github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
+require (
+	github.com/gobuffalo/envy v1.9.0 // indirect
+	github.com/gobuffalo/packd v1.0.0 // indirect
+	github.com/gobuffalo/packr v1.30.1 // indirect
+	github.com/rogpeppe/go-internal v1.6.0 // indirect
+	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
+)