Browse Source

Update fixes resources lib

Vova Tkach 5 years ago
parent
commit
f4071ff1c5

+ 1 - 1
go.mod

@@ -4,7 +4,7 @@ require (
 	github.com/disintegration/imaging v1.6.0
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/vladimirok5959/golang-server-bootstrap v1.0.5
-	github.com/vladimirok5959/golang-server-resources v1.0.2
+	github.com/vladimirok5959/golang-server-resources v1.0.3
 	github.com/vladimirok5959/golang-server-sessions v1.0.5
 	github.com/vladimirok5959/golang-server-static v1.0.0
 	google.golang.org/appengine v1.4.0 // indirect

+ 2 - 0
go.sum

@@ -9,6 +9,8 @@ github.com/vladimirok5959/golang-server-bootstrap v1.0.5 h1:+7MfVJCh/c5LcDV9xCWe
 github.com/vladimirok5959/golang-server-bootstrap v1.0.5/go.mod h1:R5PGBuqlupYd0evIXoi81plWH/HpNQO2V/jHxZzg2y0=
 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-resources v1.0.3 h1:kQLQZe2BGucs95J1A4J5pNYwscR9N65oitZib4uEw34=
+github.com/vladimirok5959/golang-server-resources v1.0.3/go.mod h1:g45afp447i47A9sdX15TMIWQzEOna8pNHwu1w0NWDwI=
 github.com/vladimirok5959/golang-server-sessions v1.0.2 h1:VG14aTnH8+vb81quhekkrJ1vTi57EU4USDX1UzDYIzw=
 github.com/vladimirok5959/golang-server-sessions v1.0.2/go.mod h1:W6eCEIltyTs5IUvN1DfzLk59z+M1031kr8bMFUiq8vU=
 github.com/vladimirok5959/golang-server-sessions v1.0.3 h1:P2HKDP1zY6H6XYrB8LzsW7boFLdWT+DtAIZE8kmtq9k=

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

@@ -11,12 +11,11 @@ type OneResource struct {
 }
 
 type Resource struct {
-	maxurl int
-	list   map[string]OneResource
+	list map[string]OneResource
 }
 
 func New() *Resource {
-	r := Resource{maxurl: 0}
+	r := Resource{}
 	r.list = map[string]OneResource{}
 	return &r
 }
@@ -28,7 +27,6 @@ func (this *Resource) Add(path string, ctype string, bytes []byte) {
 	}
 
 	// Add to resources list
-	this.maxurl = len(path)
 	this.list[path] = OneResource{
 		Path:  path,
 		Ctype: ctype,
@@ -38,7 +36,7 @@ func (this *Resource) Add(path string, ctype string, bytes []byte) {
 
 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 {
+	if len(r.URL.Path) <= 1 {
 		return false
 	}
 

+ 1 - 1
vendor/modules.txt

@@ -4,7 +4,7 @@ github.com/disintegration/imaging
 github.com/go-sql-driver/mysql
 # github.com/vladimirok5959/golang-server-bootstrap v1.0.5
 github.com/vladimirok5959/golang-server-bootstrap/bootstrap
-# github.com/vladimirok5959/golang-server-resources v1.0.2
+# github.com/vladimirok5959/golang-server-resources v1.0.3
 github.com/vladimirok5959/golang-server-resources/resource
 # github.com/vladimirok5959/golang-server-sessions v1.0.5
 github.com/vladimirok5959/golang-server-sessions/session