From b48bc0e559cf94da8a4d270c9c28e728c5ea243b Mon Sep 17 00:00:00 2001
From: Shulhan <ms@kilabit.info>
Date: Mon, 10 Jan 2022 12:15:38 +0700
Subject: go.mod: update to latest share module

---
 server.go | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'server.go')

diff --git a/server.go b/server.go
index 00d34d0..ac75d8d 100644
--- a/server.go
+++ b/server.go
@@ -20,7 +20,6 @@ import (
 //
 type server struct {
 	http    *libhttp.Server
-	opts    *libhttp.ServerOptions
 	htmlg   *htmlGenerator
 	watcher *watcher
 }
@@ -33,21 +32,29 @@ type server struct {
 // embedded HTML template.
 //
 func newServer(opts *ServeOptions) (srv *server, err error) {
-	logp := "newServer"
-
-	srv = &server{
-		opts: &libhttp.ServerOptions{
-			Options: memfs.Options{
+	var (
+		logp          = "newServer"
+		isDevelopment = debug.Value > 0
+	)
+
+	if opts.Mfs == nil {
+		opts.Mfs = &memfs.MemFS{
+			Opts: &memfs.Options{
 				Root:        opts.Root,
 				Excludes:    defExcludes,
-				Development: debug.Value > 0,
+				Development: isDevelopment,
 			},
-			Memfs:   opts.Mfs,
-			Address: opts.Address,
-		},
+		}
+	}
+
+	srv = &server{}
+
+	httpdOpts := &libhttp.ServerOptions{
+		Memfs:   opts.Mfs,
+		Address: opts.Address,
 	}
 
-	srv.http, err = libhttp.NewServer(srv.opts)
+	srv.http, err = libhttp.NewServer(httpdOpts)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", logp, err)
 	}
@@ -65,12 +72,12 @@ func newServer(opts *ServeOptions) (srv *server, err error) {
 		return nil, fmt.Errorf("%s: %w", logp, err)
 	}
 
-	srv.htmlg, err = newHTMLGenerator(opts.Mfs, opts.HtmlTemplate, srv.opts.Development)
+	srv.htmlg, err = newHTMLGenerator(opts.Mfs, opts.HtmlTemplate, isDevelopment)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", logp, err)
 	}
 
-	if srv.opts.Development {
+	if isDevelopment {
 		srv.watcher, err = newWatcher(srv.htmlg, &opts.ConvertOptions)
 		if err != nil {
 			return nil, fmt.Errorf("%s: %w", logp, err)
@@ -88,7 +95,7 @@ func newServer(opts *ServeOptions) (srv *server, err error) {
 func (srv *server) start() (err error) {
 	logp := "start"
 
-	if srv.opts.Development {
+	if srv.http.Options.Memfs.Opts.Development {
 		err := srv.watcher.start()
 		if err != nil {
 			return fmt.Errorf("%s: %w", logp, err)
@@ -96,7 +103,7 @@ func (srv *server) start() (err error) {
 	}
 
 	fmt.Printf("ciigo: starting HTTP server at %q for %q\n",
-		srv.opts.Address, srv.opts.Root)
+		srv.http.Options.Address, srv.http.Options.Memfs.Opts.Root)
 
 	err = srv.http.Start()
 	if err != nil {
-- 
cgit v1.3