all: update with latest share modules

This changes affect how the memfs.New and GoGenenerate called, does not
affect the user.

7 files changed, 59 insertions, 30 deletions

diff --git a/.gitignore b/.gitignore
index 0de739c..c23352e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /cover.html
 /cover.out
 /heap*
+/memfs_generate.go
 /rescached
 /resolver
 /resolverbench
diff --git a/Makefile b/Makefile
index 08d5385..b37ae14 100644
--- a/Makefile
+++ b/Makefile
@@ -54,10 +54,10 @@ $(COVER_OUT): $(SRC) $(SRC_TEST)
 lint:
 	-golangci-lint run --enable-all ./...
 
-$(RESCACHED_BIN): cmd/rescached/memfs.go $(SRC)
+$(RESCACHED_BIN): memfs_generate.go $(SRC)
 	go build $(DEBUG) ./cmd/rescached
 
-cmd/rescached/memfs.go: internal/generate_memfs.go _www/public/build/*
+memfs_generate.go: internal/generate_memfs.go _www/public/build/*
 	go run ./internal/generate_memfs.go
 
 $(RESOLVER_BIN): $(SRC)
diff --git a/cmd/rescached/_public b/cmd/rescached/_public
deleted file mode 120000
index d56ea50..0000000
--- a/cmd/rescached/_public
+++ /dev/null
@@ -1 +0,0 @@
-../../_www/public
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 6cc069a..cdf139d 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,6 @@ module github.com/shuLhan/rescached-go/v3
 
 go 1.13
 
-require github.com/shuLhan/share v0.19.0
+require github.com/shuLhan/share v0.22.1-0.20210111194332-8df2d3ff4b02
 
 //replace github.com/shuLhan/share => ../share
diff --git a/go.sum b/go.sum
index f14b3da..b564bce 100644
--- a/go.sum
+++ b/go.sum
@@ -1,13 +1,35 @@
-github.com/shuLhan/share v0.19.0 h1:UTBYwJcMXlK92xhjghRGnm9aK6Ont2pG/fkDmKw9ARI=
-github.com/shuLhan/share v0.19.0/go.mod h1:FqPloTQlDTAmMXxaWft/V5tPmxEHBJeyJMAzVm4/1og=
+git.sr.ht/~shulhan/asciidoctor-go v0.0.0-20201205130914-be765f32b57b/go.mod h1:ejaxKeBMNL5EpP2zjRP4B8zuOr+MM4ZyGwE3y7807WI=
+git.sr.ht/~shulhan/asciidoctor-go v0.0.0-20201226102329-36285ff15434/go.mod h1:ejaxKeBMNL5EpP2zjRP4B8zuOr+MM4ZyGwE3y7807WI=
+git.sr.ht/~shulhan/ciigo v0.3.0/go.mod h1:Y5FvSiJg88qshoR1ktj4fLzM5sk1pZcV0kJGU8GAuTo=
+git.sr.ht/~shulhan/ciigo v0.3.1-0.20210109200358-c23bd42ef521/go.mod h1:DLyaapVphRtqry80iqw+luWAKepHtbDmbvxqFmulcko=
+github.com/shuLhan/share v0.20.2-0.20201122173411-e8b3bf5ee6e9/go.mod h1:oBv+CGHG6u4Sa71+nJJJji8mCgPAadywjsB3I3k/b0o=
+github.com/shuLhan/share v0.20.2-0.20201205202022-66069b9e49fe/go.mod h1:oBv+CGHG6u4Sa71+nJJJji8mCgPAadywjsB3I3k/b0o=
+github.com/shuLhan/share v0.22.1-0.20210109185915-0490a19341d9 h1:Kqmfgkwq5dn68epHLBmPVkkLRDk3XFftqO/o3X84Mqg=
+github.com/shuLhan/share v0.22.1-0.20210109185915-0490a19341d9/go.mod h1:u9caerexlcxmPVDttj7PnkxCBDY6yBRTZ+gGR+1tO98=
+github.com/shuLhan/share v0.22.1-0.20210111194332-8df2d3ff4b02 h1:rlaqzCiWaoJS1VqvK3YUAMtcRwS3c/jq7Egg++aA7x8=
+github.com/shuLhan/share v0.22.1-0.20210111194332-8df2d3ff4b02/go.mod h1:y4+p5vUmKNNhMMhU6yGgE6QxTgJxA4nv6OOq+cIf7wU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U=
+golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
+golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210108172913-0df2131ae363 h1:wHn06sgWHMO1VsQ8F+KzDJx/JzqfsNLnc+oEi07qD7s=
+golang.org/x/sys v0.0.0-20210108172913-0df2131ae363/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/httpd.go b/httpd.go
index 7811088..90d90cd 100644
--- a/httpd.go
+++ b/httpd.go
@@ -19,11 +19,14 @@ import (
 	"github.com/shuLhan/share/lib/dns"
 	liberrors "github.com/shuLhan/share/lib/errors"
 	"github.com/shuLhan/share/lib/http"
+	"github.com/shuLhan/share/lib/memfs"
 	libnet "github.com/shuLhan/share/lib/net"
 )
 
+var memFS *memfs.MemFS
+
 const (
-	defHTTPDRootDir     = "_public/"
+	defHTTPDRootDir     = "_www/public/"
 	paramNameDomain     = "domain"
 	paramNameName       = "name"
 	paramNameQuery      = "query"
@@ -40,21 +43,24 @@ const (
 
 func (srv *Server) httpdInit() (err error) {
 	env := &http.ServerOptions{
-		Root:    defHTTPDRootDir,
-		Address: srv.env.WUIListen,
-		Includes: []string{
-			`.*\.css`,
-			`.*\.html`,
-			`.*\.js`,
-			`.*\.png`,
+		Options: memfs.Options{
+			Root: defHTTPDRootDir,
+			Includes: []string{
+				`.*\.css`,
+				`.*\.html`,
+				`.*\.js`,
+				`.*\.png`,
+			},
+			Development: srv.env.Debug >= 3,
 		},
+		Memfs:   memFS,
+		Address: srv.env.WUIListen,
 		CORSAllowOrigins: []string{
 			"http://127.0.0.1:5000",
 		},
 		CORSAllowHeaders: []string{
 			http.HeaderContentType,
 		},
-		Development: srv.env.Debug >= 3,
 	}
 
 	srv.httpd, err = http.NewServer(env)
diff --git a/internal/generate_memfs.go b/internal/generate_memfs.go
index 804a980..e51fbc3 100644
--- a/internal/generate_memfs.go
+++ b/internal/generate_memfs.go
@@ -13,19 +13,20 @@ import (
 )
 
 func main() {
-	includes := []string{
-		`.*\.html`,
-		`.*\.js`,
-		`.*\.css`,
-		`.*\.png`,
+	opts := memfs.Options{
+		Root: "_www/public/",
+		Includes: []string{
+			`.*\.html`,
+			`.*\.js`,
+			`.*\.css`,
+			`.*\.png`,
+		},
 	}
-
-	mfs, err := memfs.New("_www/public/", includes, nil, true)
+	mfs, err := memfs.New(&opts)
 	if err != nil {
 		log.Fatal(err)
 	}
-
-	err = mfs.GoGenerate("main", "cmd/rescached/memfs.go", memfs.EncodingGzip)
+	err = mfs.GoGenerate("rescached", "memFS", "memfs_generate.go", memfs.EncodingGzip)
 	if err != nil {
 		log.Fatal(err)
 	}