refactor(code): improve code quality

zhangrl · Aug 14, 2020 · 9e14dc5 · 9e14dc5
1 parent 94d8d52
commit 9e14dc5
Show file tree

Hide file tree

Showing 30 changed files with 76 additions and 172 deletions.
diff --git a/adm/compile_assets.go b/adm/compile_assets.go
@@ -55,6 +55,9 @@ var AssetPaths = map[string]string{
 }`
 
 		err = ioutil.WriteFile(outputPath+"/assets_list.go", []byte(listContent), 0644)
+		if err != nil {
+			return
+		}
 		err = ioutil.WriteFile(outputPath+"/assets_path.go", []byte(pathsContent), 0644)
 		if err != nil {
 			return

diff --git a/adm/minify.go b/adm/minify.go
@@ -22,52 +22,48 @@ func cssMinifier(inputDir, outputFile string, hash bool) {
 	err := removeOutputFile(outputFile)
 	if err != nil {
 		log.Panicln("removeOutputFileError", err)
-		return
 	}
 
 	files, err := getInputFiles(inputDir)
 	if err != nil {
 		log.Panicln("getInputFilesError", err)
-		return
 	}
 
 	notMinifiedString, err := combineFiles(files, inputDir)
 	if err != nil {
 		log.Panicln("combineFilesError", err)
-		return
 	}
 
 	minifiedString, err := makeMini(notMinifiedString, "text/css")
 	if err != nil {
 		log.Panicln("doTheMinifyingError", err)
-		return
 	}
 
 	if hash && filepath.Ext(outputFile) == ".css" {
 		m5 := md5.New()
-		m5.Write([]byte(minifiedString))
+		_, err := m5.Write([]byte(minifiedString))
+		if err != nil {
+			log.Panicln("combineFilesError", err)
+		}
 		m5res := hex.EncodeToString(m5.Sum(nil))
 		outputFile = strings.ReplaceAll(outputFile, ".css", "."+m5res[len(m5res)-10:]+".css")
 	}
 
 	err = writeOutputFile(minifiedString, outputFile)
 	if err != nil {
 		log.Panicln("writeOutputFileError", err)
-		return
 	}
 }
 
 func jsMinifier(inputDir, outputFile string, hash bool) {
 	err := removeOutputFile(outputFile)
 	if err != nil {
 		log.Panicln("removeOutputFileError", err)
-		return
 	}
 
 	files, err := getInputFiles(inputDir)
 	if err != nil {
 		log.Panicln("getInputFilesError", err)
-		return
 	}
 
 	var b bytes.Buffer
@@ -81,7 +77,7 @@ func jsMinifier(inputDir, outputFile string, hash bool) {
 		filePath := inputDir + name
 		fileTxt, err := ioutil.ReadFile(filePath)
 		if err != nil {
-			return
+			checkError(err)
 		}
 
 		fmt.Println("file path", filePath)
@@ -91,26 +87,28 @@ func jsMinifier(inputDir, outputFile string, hash bool) {
 
 		minifiedString, err := m.Bytes("text/javascript", fileTxt)
 		if err != nil {
-			return
+			checkError(err)
 		}
 
 		_, err = b.Write(minifiedString)
 		if err != nil {
-			return
+			checkError(err)
 		}
 	}
 
 	if hash && filepath.Ext(outputFile) == ".js" {
 		m5 := md5.New()
-		m5.Write(b.Bytes())
+		_, err := m5.Write(b.Bytes())
+		if err != nil {
+			checkError(err)
+		}
 		m5res := hex.EncodeToString(m5.Sum(nil))
 		outputFile = strings.ReplaceAll(outputFile, ".js", "."+m5res[len(m5res)-10:]+".js")
 	}
 
 	err = writeOutputFile(b.String(), outputFile)
 	if err != nil {
 		checkError(err)
-		return
 	}
 }
 

diff --git a/adm/project.go b/adm/project.go
@@ -268,13 +268,13 @@ var Generators = map[string]table.Generator{
 	}
 
 	configByte, err := json.MarshalIndent(cfg, "", "	")
-	configByte = bytes.Replace(configByte, []byte(`
+	configByte = bytes.ReplaceAll(configByte, []byte(`
 	"logger": {
 		"encoder": {},
 		"rotate": {}
-	},`), []byte{}, -1)
-	configByte = bytes.Replace(configByte, []byte(`,
-	"animation": {}`), []byte{}, -1)
+	},`), []byte{})
+	configByte = bytes.ReplaceAll(configByte, []byte(`,
+	"animation": {}`), []byte{})
 	checkError(err)
 	checkError(ioutil.WriteFile("./config.json", configByte, 0644))
 

diff --git a/adm/project_template.go b/adm/project_template.go
@@ -55,7 +55,7 @@ func startServer() {
 
 	_ = r.Run(":{{.Port}}")
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")
@@ -115,7 +115,7 @@ func startServer() {
 	beego.BConfig.Listen.HTTPPort = {{.Port}}
 	go app.Run()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")
@@ -179,7 +179,7 @@ func startServer() {
 		_ = bu.Serve()
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")
@@ -244,7 +244,7 @@ func startServer() {
 		_ = http.ListenAndServe(":{{.Port}}", r)
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")
@@ -323,7 +323,7 @@ func startServer() {
 
 	go e.Logger.Fatal(e.Start(":{{.Port}}"))
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")
@@ -384,7 +384,7 @@ func startServer() {
 		_ = fasthttp.ListenAndServe(":{{.Port}}", router.Handler)
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")
@@ -443,7 +443,7 @@ func startServer() {
 	s.SetPort({{.Port}})
 	go s.Run()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")
@@ -504,7 +504,7 @@ func startServer() {
 		_ = http.ListenAndServe(":{{.Port}}", app)
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")
@@ -568,7 +568,7 @@ func startServer() {
 		_ = app.Run(iris.Addr(":{{.Port}}"))
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/adm/template.go b/adm/template.go
@@ -49,6 +49,8 @@ func downloadTo(url, output string) {
 
 	file, err := os.Create(output)
 
+	checkError(err)
+
 	_, err = io.Copy(file, res.Body)
 
 	checkError(err)

diff --git a/context/trie.go b/context/trie.go
@@ -96,15 +96,6 @@ func (n *node) printChildren() {
 	}
 }
 
-func (n *node) printLeafChildren() {
-	if len(n.handle) > 0 {
-		n.print()
-	}
-	for _, child := range n.children {
-		child.printLeafChildren()
-	}
-}
-
 func stringToArr(path string) []string {
 	var (
 		paths      = make([]string, 0)

diff --git a/examples/beego/main.go b/examples/beego/main.go
@@ -91,7 +91,7 @@ func main() {
 	beego.BConfig.Listen.HTTPPort = 9087
 	go app.Run()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/examples/buffalo/main.go b/examples/buffalo/main.go
@@ -95,7 +95,7 @@ func main() {
 		_ = bu.Serve()
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/examples/chi/main.go b/examples/chi/main.go
@@ -96,7 +96,7 @@ func main() {
 		_ = http.ListenAndServe(":3333", r)
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/examples/echo/main.go b/examples/echo/main.go
@@ -89,7 +89,7 @@ func main() {
 	// Start server
 	go e.Logger.Fatal(e.Start(":1323"))
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/examples/fasthttp/main.go b/examples/fasthttp/main.go
@@ -89,7 +89,7 @@ func main() {
 		_ = fasthttp.ListenAndServe(":8897", router.Handler)
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/examples/gf/main.go b/examples/gf/main.go
@@ -93,7 +93,7 @@ func main() {
 	s.SetPort(9033)
 	go s.Run()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/examples/gin/main.go b/examples/gin/main.go
@@ -104,7 +104,7 @@ func main() {
 		_ = r.Run(":9033")
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/examples/gorilla/main.go b/examples/gorilla/main.go
@@ -88,7 +88,7 @@ func main() {
 		_ = http.ListenAndServe(":9033", app)
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")

diff --git a/examples/iris/main.go b/examples/iris/main.go
@@ -94,7 +94,7 @@ func main() {
 		_ = app.Run(iris.Addr(":8099"))
 	}()
 
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
 	log.Print("closing database connection")