Merge pull request #26 from xushiwei/app

static: support http filesystem

classfile.go

@@ -78,6 +78,16 @@ func (p App) Delete(path string, handle func(ctx *Context)) {
 	p.Route(http.MethodDelete, path, handle)
 }
 
+// Static serves static files from a dir (default is "$YapFS/static").
+func (p *App) Static__0(pattern string, dir ...fs.FS) {
+	p.Static(pattern, dir...)
+}
+
+// Static serves static files from a http file system.
+func (p *App) Static__1(pattern string, fs http.FileSystem) {
+	p.StaticHttp(pattern, fs)
+}
+
 // Gopt_App_Main is required by Go+ compiler as the entry of a YAP project.
 func Gopt_App_Main(app interface{ initApp() }) {
 	app.initApp()

demo/classfile_static/gop_autogen.go

@@ -8,9 +8,9 @@ type staticfile struct {
 //line demo/classfile_static/staticfile_yap.gox:1
 func (this *staticfile) MainEntry() {
 //line demo/classfile_static/staticfile_yap.gox:1:1
-	this.Static("/foo", this.FS("public"))
+	this.Static__0("/foo", this.FS("public"))
 //line demo/classfile_static/staticfile_yap.gox:2:1
-	this.Static("/")
+	this.Static__0("/")
 //line demo/classfile_static/staticfile_yap.gox:4:1
 	this.Run(":8888")
 }

yap.go

@@ -88,10 +88,15 @@ func (p *Engine) Static(pattern string, dir ...fs.FS) {
 	} else {
 		fsys = p.FS("static")
 	}
+	p.StaticHttp(pattern, http.FS(fsys))
+}
+
+// StaticHttp serves static files from fsys (http.FileSystem).
+func (p *Engine) StaticHttp(pattern string, fsys http.FileSystem) {
 	if !strings.HasSuffix(pattern, "/") {
 		pattern += "/"
 	}
-	p.Mux.Handle(pattern, http.StripPrefix(pattern, http.FileServer(http.FS(fsys))))
+	p.Mux.Handle(pattern, http.StripPrefix(pattern, http.FileServer(fsys)))
 }
 
 // Handle registers the handler function for the given pattern.