Add FileSystem support

Alexander Menzhinsky · Alexander Menzhinsky · commit e9eeddf525d4 · 2017-02-22T22:09:42.000+03:00
diff --git a/context.go b/context.go
@@ -10,7 +10,6 @@ import (
 	"net"
 	"net/http"
 	"net/url"
-	"os"
 	"path/filepath"
 	"strings"
 )
@@ -472,7 +471,7 @@ func (c *context) Stream(code int, contentType string, r io.Reader) (err error)
 }
 
 func (c *context) File(file string) error {
-	f, err := os.Open(file)
+	f, err := c.echo.FS.Open(file)
 	if err != nil {
 		return ErrNotFound
 	}
@@ -481,7 +480,7 @@ func (c *context) File(file string) error {
 	fi, _ := f.Stat()
 	if fi.IsDir() {
 		file = filepath.Join(file, indexPage)
-		f, err = os.Open(file)
+		f, err = c.echo.FS.Open(file)
 		if err != nil {
 			return ErrNotFound
 		}
diff --git a/echo.go b/echo.go
@@ -45,6 +45,7 @@ import (
 	stdLog "log"
 	"net"
 	"net/http"
+	"os"
 	"path"
 	"reflect"
 	"runtime"
@@ -80,6 +81,7 @@ type (
 		AutoTLSManager   autocert.Manager
 		Mutex            sync.RWMutex
 		Logger           Logger
+		FS               http.FileSystem
 	}
 
 	// Route contains a handler and information for matching against requests.
@@ -238,6 +240,14 @@ var (
 	}
 )
 
+// FS implements http.FileSystem
+type FS struct {}
+
+// Open opens the named file for serving
+func (fs *FS) Open(name string) (http.File, error) {
+	return os.Open(name)
+}
+
 // New creates an instance of Echo.
 func New() (e *Echo) {
 	e = &Echo{
@@ -260,6 +270,7 @@ func New() (e *Echo) {
 		return e.NewContext(nil, nil)
 	}
 	e.router = NewRouter(e)
+	e.FS = &FS{}
 	return
 }
 
diff --git a/echo_test.go b/echo_test.go
@@ -2,15 +2,12 @@ package echo
 
 import (
 	"bytes"
+	"errors"
 	"net/http"
 	"net/http/httptest"
-	"testing"
-
 	"reflect"
 	"strings"
-
-	"errors"
-
+	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
@@ -85,6 +82,16 @@ func TestEchoStatic(t *testing.T) {
 	assert.Equal(t, true, strings.HasPrefix(r, "<!doctype html>"))
 }
 
+func TestStaticCustomFS(t *testing.T) {
+	e := New()
+	e.FS = http.Dir("_fixture")
+
+	e.Static("/images", "images")
+	c, b := request(GET, "/images/walle.png", e)
+	assert.Equal(t, http.StatusOK, c)
+	assert.NotEmpty(t, b)
+}
+
 func TestEchoFile(t *testing.T) {
 	e := New()
 	e.File("/walle", "_fixture/images/walle.png")

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"net"`
`11`	`11`	`"net/http"`
`12`	`12`	`"net/url"`
`13`		`- "os"`
`14`	`13`	`"path/filepath"`
`15`	`14`	`"strings"`
`16`	`15`	`)`
`@@ -472,7 +471,7 @@ func (c *context) Stream(code int, contentType string, r io.Reader) (err error)`
`472`	`471`	`}`
`473`	`472`
`474`	`473`	`func (c *context) File(file string) error {`
`475`		`- f, err := os.Open(file)`
	`474`	`+ f, err := c.echo.FS.Open(file)`
`476`	`475`	`if err != nil {`
`477`	`476`	`return ErrNotFound`
`478`	`477`	`}`
`@@ -481,7 +480,7 @@ func (c *context) File(file string) error {`
`481`	`480`	`fi, _ := f.Stat()`
`482`	`481`	`if fi.IsDir() {`
`483`	`482`	`file = filepath.Join(file, indexPage)`
`484`		`- f, err = os.Open(file)`
	`483`	`+ f, err = c.echo.FS.Open(file)`
`485`	`484`	`if err != nil {`
`486`	`485`	`return ErrNotFound`
`487`	`486`	`}`