clean up code, do real delete when click delete, update style set content width

Author: keller0

cmd.go

@@ -15,16 +15,17 @@ import (
 //go:embed web
 var webDir embed.FS
 
+// tmpFile struct
 type tmpFile struct {
-	T  string `json:"t"`
-	N  string `json:"n"`
-	Ns string `json:"ns"`
+	T  string `json:"t"`  // 0: normal file
+	N  string `json:"n"`  // file url
+	Ns string `json:"ns"` // file name
 }
 
 var (
 	sData    string
-	imgList  []string
-	fileList []tmpFile
+	imgList  []string  // img url list
+	fileList []tmpFile // file list
 )
 
 func runServer() error {
@@ -37,14 +38,14 @@ func runServer() error {
 
 	setRouter(r)
 
-	// Set memory limit for multipart forms (default is 32 MiB)
-	r.MaxMultipartMemory = 50 << 20
+	loadOldFiles()
+
+	// Set memory limit for multipart forms
+	r.MaxMultipartMemory = 20 << 20 // 20 MiB
 
 	ads := address + ":" + port
 	fmt.Println("server started at http://" + ads)
 
-	loadOldFiles()
-
 	return r.Run(ads)
 
 }
@@ -56,19 +57,21 @@ func setRouter(r *gin.Engine) {
 
 	r.StaticFS("/static", http.FS(webDir))
 	r.GET("/", func(c *gin.Context) {
-		c.HTML(http.StatusOK, "index.html", gin.H{"data": sData, "imaList": imgList, "fileList": fileList})
+		c.HTML(http.StatusOK, "index.html", gin.H{"data": sData, "imgList": imgList, "fileList": fileList})
 	})
 
 	r.POST("/", func(c *gin.Context) {
 		sData = c.PostForm("sData")
-		c.HTML(http.StatusOK, "index.html", gin.H{"data": sData, "imaList": imgList, "fileList": fileList})
+		c.HTML(http.StatusOK, "index.html", gin.H{"data": sData, "imgList": imgList, "fileList": fileList})
 	})
 
 	r.POST("/clearFile", func(c *gin.Context) {
+		clearTmpFile()
 		fileList = nil
 		imgList = nil
-		c.HTML(http.StatusOK, "index.html", gin.H{"data": sData, "imaList": imgList, "fileList": fileList})
+		c.HTML(http.StatusOK, "index.html", gin.H{"data": sData, "imgList": imgList, "fileList": fileList})
 	})
+
 	r.POST("/upload", func(c *gin.Context) {
 		// Single file
 		file, err := c.FormFile("file")
@@ -77,7 +80,6 @@ func setRouter(r *gin.Engine) {
 			c.String(http.StatusBadRequest, err.Error())
 		}
 
-		// saveName := strconv.FormatInt(time.Now().UnixNano(), 10) + path.Ext(file.Filename)
 		saveName := file.Filename
 
 		err = c.SaveUploadedFile(file, tmpFileDir+"/"+saveName)
@@ -119,7 +121,17 @@ func loadOldFiles() {
 			fileList = append(fileList, tmpFile{T: "0", N: fileUrl, Ns: f.Name()})
 		}
 	}
+}
 
+func clearTmpFile() {
+	err := os.RemoveAll(tmpFileDir)
+	if err != nil {
+		log.Fatal(err)
+	}
+	err = os.MkdirAll(tmpFileDir, os.ModePerm)
+	if err != nil {
+		log.Fatal(err)
+	}
 }
 
 func isImgSimple(name string) bool {

http.go

@@ -1,5 +1,58 @@
 package main
 
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	address    string
+	port       string
+	tmpFileDir string
+)
+
+func init() {
+
+	rootCmd.PersistentFlags().StringVarP(&port, "port", "p", "7777", "listen port")
+	rootCmd.PersistentFlags().StringVarP(&address, "address", "a", "127.0.0.1", "listen address")
+	rootCmd.PersistentFlags().StringVarP(&tmpFileDir, "folder", "f", "tmpFile", "tmp file folder")
+
+}
+
+var rootCmd = &cobra.Command{
+	Use:   "simpleshare",
+	Short: "Share texts and files in local network",
+	Long: `
+  A Simple http service for share texts and files in local network
+built in Go.
+  source: https://github.com/keller0/simpleshare`,
+	CompletionOptions: cobra.CompletionOptions{HiddenDefaultCmd: true},
+	Version:           "0.0.2",
+	Example:           "./simpleshare  -a 127.0.0.1 -p 7777 -f tmpFile",
+	Run: func(cmd *cobra.Command, args []string) {
+		tDir := filepath.Join(".", tmpFileDir)
+		err := os.MkdirAll(tDir, os.ModePerm)
+		if err != nil {
+			panic(err)
+		}
+		fmt.Println("tmp file folder:", tDir)
+		err = runServer()
+		if err != nil {
+			fmt.Println(err)
+		}
+	},
+}
+
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
 func main() {
 	Execute()
 }

main.go

@@ -11,13 +11,13 @@
 
     <div style="text-align: center;max-width: 920px; margin: auto">
         <div><p style="font-weight: bold;">Share texts and files in your local network</p></div>
-        <textarea name="" id="" cols="100" rows="15">{{ .data }}</textarea>
+        <textarea name="" id="showDataArea" cols="100" rows="15">{{ .data }}</textarea>
         <div id="div-mobile" class="up-box">
             <!-- <input name="photo" type="file" id="upLoadOneFile" accept="image/*"> -->
             <input name="photo" type="file" id="upLoadOneFile" multiple onchange="handleSelectFilesChange(this)" >
         </div>
         <form action="/" method="POST" id="dForm">
-            <textarea name="sData" id="sData" cols="100" rows="4"
+            <textarea name="sData" id="inputDataArea" cols="100" rows="4"
              placeholder="Input text and submit or drop files on the page"></textarea>
             <br>
         </form>
@@ -38,7 +38,7 @@
         </div>
         <br>
         <div id="imgList">
-            {{ range .imaList }}
+            {{ range .imgList }}
             <img style="width: 300px; padding: 5px" src="{{ . }}" alt="">
             {{ end }}
         </div>
@@ -57,9 +57,18 @@
         max-width: 95%;
         resize:vertical;
     }
+    .progress-bar {
+        width: 90%;
+        margin: auto;
+        background-color: #ddd;
+    }
     @media screen and (min-width: 769px) {
         #div-mobile { display: none; }
         #div-desktop { display: block; }
+
+        #inputDataArea {width: 700px;}
+        #showDataArea {width: 700px;}
+        .progress-bar{width: 700px;}
     }
 
     @media screen and (max-width: 768px) {
@@ -70,12 +79,6 @@
         margin: 5px;
         text-align: left;
     }
-
-    .progress-bar {
-        width: 90%;
-        margin: auto;
-        background-color: #ddd;
-    }
     #progress {
         width: 0%;
         height: 1em;