fix: typo assert -> asset

marjune163 · marjune163 · commit efe0314e0cbc · 2020-07-25T19:52:23.000+08:00
diff --git a/src/Makefile b/src/Makefile
@@ -6,8 +6,8 @@ endef
 
 tpls:
 	$(call embed, tpl/page.html)
-	sed -i -e 's;/../assert/;?assert=;g' tpl/page.html.go
+	sed -i -e 's;/../asset/;?asset=;g' tpl/page.html.go
 
-	$(call embed, tpl/assert/main.css)
+	$(call embed, tpl/asset/main.css)
 
-	$(call embed, tpl/assert/main.js)
+	$(call embed, tpl/asset/main.js)
diff --git a/src/serverHandler/asset.go b/src/serverHandler/asset.go
@@ -1,15 +1,15 @@
 package serverHandler
 
 import (
-	"../tpl/assert"
+	"../tpl/asset"
 	"net/http"
 	"time"
 )
 
 var initTime = time.Now()
 
-func (h *handler) assert(w http.ResponseWriter, r *http.Request, assertPath string) {
-	content, ok := assert.Get(assertPath)
+func (h *handler) asset(w http.ResponseWriter, r *http.Request, assetPath string) {
+	content, ok := asset.Get(assetPath)
 	if !ok {
 		return
 	}
@@ -18,6 +18,6 @@ func (h *handler) assert(w http.ResponseWriter, r *http.Request, assertPath stri
 	header.Set("Content-Type", content.ContentType)
 	header.Set("Cache-Control", "public, max-age=3600")
 	if needResponseBody(r.Method) {
-		http.ServeContent(w, r, assertPath, initTime, content.ReadSeeker)
+		http.ServeContent(w, r, assetPath, initTime, content.ReadSeeker)
 	}
 }
diff --git a/src/serverHandler/main.go b/src/serverHandler/main.go
@@ -60,11 +60,11 @@ type handler struct {
 func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	go h.logRequest(r)
 
-	// assert
-	const assertPrefix = "assert="
-	if strings.HasPrefix(r.URL.RawQuery, assertPrefix) {
-		assertPath := r.URL.RawQuery[len(assertPrefix):]
-		h.assert(w, r, assertPath)
+	// asset
+	const assetPrefix = "asset="
+	if strings.HasPrefix(r.URL.RawQuery, assetPrefix) {
+		assetPath := r.URL.RawQuery[len(assetPrefix):]
+		h.asset(w, r, assetPath)
 		return
 	}
 
diff --git a/src/tpl/asset/main.css b/src/tpl/asset/main.css
diff --git a/src/tpl/asset/main.css.go b/src/tpl/asset/main.css.go
@@ -1,4 +1,4 @@
-package assert
+package asset
 
 const mainCss = `
 html, body {
diff --git a/src/tpl/asset/main.go b/src/tpl/asset/main.go
@@ -1,4 +1,4 @@
-package assert
+package asset
 
 import (
 	"io"
@@ -10,12 +10,12 @@ type content struct {
 	ReadSeeker  io.ReadSeeker
 }
 
-var asserts = map[string]content{
+var assets = map[string]content{
 	"main.css": {"text/css", strings.NewReader(mainCss)},
 	"main.js":  {"application/javascript", strings.NewReader(mainJs)},
 }
 
 func Get(path string) (content, bool) {
-	c, ok := asserts[path]
+	c, ok := assets[path]
 	return c, ok
 }
diff --git a/src/tpl/asset/main.js b/src/tpl/asset/main.js
diff --git a/src/tpl/asset/main.js.go b/src/tpl/asset/main.js.go
@@ -1,4 +1,4 @@
-package assert
+package asset
 
 const mainJs = `
 (function () {
diff --git a/src/tpl/page.html b/src/tpl/page.html
@@ -8,7 +8,7 @@
 	<meta name="renderer" content="webkit"/>
 	<meta name="wap-font-scale" content="no"/>
 	<title>{{.Path}}</title>
-	<link rel="stylesheet" type="text/css" href="{{.RootRelPath}}/../assert/main.css"/>
+	<link rel="stylesheet" type="text/css" href="{{.RootRelPath}}/../asset/main.css"/>
 </head>
 <body class="{{if .IsRoot}}root-dir{{else}}sub-dir{{end}}">
 {{$contextQueryString := .Context.QueryString}}
@@ -98,6 +98,6 @@
 	<div class="error">500 potential issue occurred</div>
 {{end}}
 
-<script type="text/javascript" src="{{.RootRelPath}}/../assert/main.js" defer="defer" async="async"></script>
+<script type="text/javascript" src="{{.RootRelPath}}/../asset/main.js" defer="defer" async="async"></script>
 </body>
 </html>
diff --git a/src/tpl/page.html.go b/src/tpl/page.html.go
@@ -18,7 +18,7 @@ const pageTplStr = `
 <meta name="renderer" content="webkit"/>
 <meta name="wap-font-scale" content="no"/>
 <title>{{.Path}}</title>
-<link rel="stylesheet" type="text/css" href="{{.RootRelPath}}?assert=main.css"/>
+<link rel="stylesheet" type="text/css" href="{{.RootRelPath}}?asset=main.css"/>
 </head>
 <body class="{{if .IsRoot}}root-dir{{else}}sub-dir{{end}}">
 {{$contextQueryString := .Context.QueryString}}
@@ -101,7 +101,7 @@ return confirm('Delete?\n' + name);
 {{else if eq .Status 500}}
 <div class="error">500 potential issue occurred</div>
 {{end}}
-<script type="text/javascript" src="{{.RootRelPath}}?assert=main.js" defer="defer" async="async"></script>
+<script type="text/javascript" src="{{.RootRelPath}}?asset=main.js" defer="defer" async="async"></script>
 </body>
 </html>
 `

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`package serverHandler`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "../tpl/assert"`
	`4`	`+ "../tpl/asset"`
`5`	`5`	`"net/http"`
`6`	`6`	`"time"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`var initTime = time.Now()`
`10`	`10`
`11`		`-func (h handler) assert(w http.ResponseWriter, r http.Request, assertPath string) {`
`12`		`- content, ok := assert.Get(assertPath)`
	`11`	`+func (h handler) asset(w http.ResponseWriter, r http.Request, assetPath string) {`
	`12`	`+ content, ok := asset.Get(assetPath)`
`13`	`13`	`if !ok {`
`14`	`14`	`return`
`15`	`15`	`}`
`@@ -18,6 +18,6 @@ func (h handler) assert(w http.ResponseWriter, r http.Request, assertPath stri`
`18`	`18`	`header.Set("Content-Type", content.ContentType)`
`19`	`19`	`header.Set("Cache-Control", "public, max-age=3600")`
`20`	`20`	`if needResponseBody(r.Method) {`
`21`		`- http.ServeContent(w, r, assertPath, initTime, content.ReadSeeker)`
	`21`	`+ http.ServeContent(w, r, assetPath, initTime, content.ReadSeeker)`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package assert`
	`1`	`+package asset`
`2`	`2`
`3`	`3`	const mainCss = `
`4`	`4`	`html, body {`