Move resources from main file, upgarde deps

assets/assets.go

@@ -1 +1,45 @@
 package assets
+
+import (
+	"golang-fave/consts"
+
+	"github.com/vladimirok5959/golang-server-resources/resource"
+)
+
+func PopulateResources(res *resource.Resource) {
+	res.Add(
+		consts.AssetsCpScriptsJs,
+		"application/javascript; charset=utf-8",
+		CpScriptsJs,
+	)
+	res.Add(
+		consts.AssetsCpStylesCss,
+		"text/css",
+		CpStylesCss,
+	)
+	res.Add(
+		consts.AssetsSysBgPng,
+		"image/png",
+		SysBgPng,
+	)
+	res.Add(
+		consts.AssetsSysFaveIco,
+		"image/x-icon",
+		SysFaveIco,
+	)
+	res.Add(
+		consts.AssetsSysLogoPng,
+		"image/png",
+		SysLogoPng,
+	)
+	res.Add(
+		consts.AssetsSysLogoSvg,
+		"image/svg+xml",
+		SysLogoSvg,
+	)
+	res.Add(
+		consts.AssetsSysStylesCss,
+		"text/css",
+		SysStylesCss,
+	)
+}

go.mod

@@ -3,7 +3,7 @@ module golang-fave
 require (
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/vladimirok5959/golang-server-bootstrap v1.0.2
-	github.com/vladimirok5959/golang-server-resources v1.0.0
+	github.com/vladimirok5959/golang-server-resources v1.0.2
 	github.com/vladimirok5959/golang-server-sessions v1.0.1
 	github.com/vladimirok5959/golang-server-static v1.0.0
 	google.golang.org/appengine v1.4.0 // indirect

go.sum

@@ -1,12 +1,10 @@
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/vladimirok5959/golang-server-bootstrap v1.0.1 h1:vdLfBYdgQORd83K4imnHJbz7UaGccEgJN0t8TqLb/e4=
-github.com/vladimirok5959/golang-server-bootstrap v1.0.1/go.mod h1:R5PGBuqlupYd0evIXoi81plWH/HpNQO2V/jHxZzg2y0=
 github.com/vladimirok5959/golang-server-bootstrap v1.0.2 h1:UiOKkiNGcEddnx9O0cuLM1euSWgKimQCFIMD0+W8njw=
 github.com/vladimirok5959/golang-server-bootstrap v1.0.2/go.mod h1:R5PGBuqlupYd0evIXoi81plWH/HpNQO2V/jHxZzg2y0=
-github.com/vladimirok5959/golang-server-resources v1.0.0 h1:zX2929ItoGHDmQD6OTpxoFbO7Cj7/9Q2eAgoSAA8gNI=
-github.com/vladimirok5959/golang-server-resources v1.0.0/go.mod h1:tsf2oAEf3E3ukiQSCO7dstl0IXbEXec68UUIiMWysBc=
+github.com/vladimirok5959/golang-server-resources v1.0.2 h1:XwxFXyaOtfDGRmYp8P9q4P4gx4YK8NiYacpHe9V8Lck=
+github.com/vladimirok5959/golang-server-resources v1.0.2/go.mod h1:tsf2oAEf3E3ukiQSCO7dstl0IXbEXec68UUIiMWysBc=
 github.com/vladimirok5959/golang-server-sessions v1.0.1 h1:cQsLk8hz7pkIV7/XectfejDF2j+61FE+/s4xErxBNJw=
 github.com/vladimirok5959/golang-server-sessions v1.0.1/go.mod h1:W6eCEIltyTs5IUvN1DfzLk59z+M1031kr8bMFUiq8vU=
 github.com/vladimirok5959/golang-server-static v1.0.0 h1:jmVNUCVF44+Am0euUMYFN4L3gdJYwm7aS8LFUmUAHJk=

main.go

@@ -53,13 +53,7 @@ func main() {
 
 	// Init mounted resources
 	res := resource.New()
-	res.Add(consts.AssetsCpScriptsJs, "application/javascript; charset=utf-8", assets.CpScriptsJs)
-	res.Add(consts.AssetsCpStylesCss, "text/css", assets.CpStylesCss)
-	res.Add(consts.AssetsSysBgPng, "image/png", assets.SysBgPng)
-	res.Add(consts.AssetsSysFaveIco, "image/x-icon", assets.SysFaveIco)
-	res.Add(consts.AssetsSysLogoPng, "image/png", assets.SysLogoPng)
-	res.Add(consts.AssetsSysLogoSvg, "image/svg+xml", assets.SysLogoSvg)
-	res.Add(consts.AssetsSysStylesCss, "text/css", assets.SysStylesCss)
+	assets.PopulateResources(res)
 
 	// Init static files helper
 	stat := static.New(consts.DirIndexFile)
@@ -75,7 +69,7 @@ func main() {
 		r.URL.Scheme = "http"
 
 		// Mounted assets
-		if res.Response(w, r, func(w http.ResponseWriter, r *http.Request, i *resource.Resource) {
+		if res.Response(w, r, func(w http.ResponseWriter, r *http.Request, i *resource.OneResource) {
 			w.Header().Set("Cache-Control", "public, max-age=31536000")
 		}, nil) {
 			return

vendor/github.com/vladimirok5959/golang-server-resources/resource/resource.go

@@ -4,24 +4,24 @@ import (
 	"net/http"
 )
 
-type Resource struct {
+type OneResource struct {
 	Path  string
 	Ctype string
 	Bytes []byte
 }
 
-type resource struct {
+type Resource struct {
 	maxurl int
-	list   map[string]Resource
+	list   map[string]OneResource
 }
 
-func New() *resource {
-	r := resource{maxurl: 0}
-	r.list = map[string]Resource{}
+func New() *Resource {
+	r := Resource{maxurl: 0}
+	r.list = map[string]OneResource{}
 	return &r
 }
 
-func (this *resource) Add(path string, ctype string, bytes []byte) {
+func (this *Resource) Add(path string, ctype string, bytes []byte) {
 	// Do not add if already in resources list
 	if _, ok := this.list[path]; ok == true {
 		return
@@ -29,14 +29,14 @@ func (this *resource) Add(path string, ctype string, bytes []byte) {
 
 	// Add to resources list
 	this.maxurl = len(path)
-	this.list[path] = Resource{
+	this.list[path] = OneResource{
 		Path:  path,
 		Ctype: ctype,
 		Bytes: bytes,
 	}
 }
 
-func (this *resource) Response(w http.ResponseWriter, r *http.Request, before func(w http.ResponseWriter, r *http.Request, i *Resource), after func(w http.ResponseWriter, r *http.Request, i *Resource)) bool {
+func (this *Resource) Response(w http.ResponseWriter, r *http.Request, before func(w http.ResponseWriter, r *http.Request, i *OneResource), after func(w http.ResponseWriter, r *http.Request, i *OneResource)) bool {
 	// Do not process if this is not necessary
 	if len(r.URL.Path) <= 1 || len(r.URL.Path)-1 > this.maxurl {
 		return false

vendor/modules.txt

@@ -2,7 +2,7 @@
 github.com/go-sql-driver/mysql
 # github.com/vladimirok5959/golang-server-bootstrap v1.0.2
 github.com/vladimirok5959/golang-server-bootstrap/bootstrap
-# github.com/vladimirok5959/golang-server-resources v1.0.0
+# github.com/vladimirok5959/golang-server-resources v1.0.2
 github.com/vladimirok5959/golang-server-resources/resource
 # github.com/vladimirok5959/golang-server-sessions v1.0.1
 github.com/vladimirok5959/golang-server-sessions/session