Commit 2f02653b authored by astaxie's avatar astaxie

add GetFIle & enhance router

parent f9e8b4f1
......@@ -7,6 +7,7 @@ import (
"github.com/astaxie/beego/session"
"html/template"
"io/ioutil"
"mime/multipart"
"net/http"
"net/url"
"path"
......@@ -191,6 +192,10 @@ func (c *Controller) GetBool(key string) (bool, error) {
return strconv.ParseBool(c.Input().Get(key))
}
func (c *Controller) GetFile(key string) (multipart.File, *multipart.FileHeader, error) {
return c.Ctx.Request.FormFile(key)
}
func (c *Controller) StartSession() (sess session.SessionStore) {
sess = GlobalSessions.SessionStart(c.Ctx.ResponseWriter, c.Ctx.Request)
return
......
......@@ -41,17 +41,43 @@ func (p *ControllerRegistor) Add(pattern string, c ControllerInterface) {
params := make(map[int]string)
for i, part := range parts {
if strings.HasPrefix(part, ":") {
expr := "([^/]+)"
expr := "(.+)"
//a user may choose to override the defult expression
// similar to expressjs: ‘/user/:id([0-9]+)’
if index := strings.Index(part, "("); index != -1 {
expr = part[index:]
part = part[:index]
//match /user/:id:int ([0-9]+)
//match /post/:username:word ([\w]+)
} else if lindex := strings.LastIndex(part, ":"); lindex != 0 {
switch part[lindex:] {
case "int":
expr = "([0-9]+)"
part = part[:index]
case "word":
expr = `([\w]+)`
part = part[:index]
}
}
params[j] = part
parts[i] = expr
j++
}
if strings.HasPrefix(part, "*") {
expr := "(.+)"
if part == "*.*" {
params[j] = ":path"
parts[j] = "([^.]+)."
j++
params[j] = ":ext"
parts[j] = "([^.]+)"
j++
} else {
params[j] = ":splat"
parts[i] = expr
j++
}
}
}
if j == 0 {
//now create the Route
......@@ -79,10 +105,8 @@ func (p *ControllerRegistor) Add(pattern string, c ControllerInterface) {
route.params = params
route.pattern = pattern
route.controllerType = t
p.routers = append(p.routers, route)
}
}
func (p *ControllerRegistor) AddHandler(pattern string, c http.Handler) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment