From 47fc32ba4791f4cef59dc07458840f98177b3597 Mon Sep 17 00:00:00 2001 From: knightmare Date: Mon, 25 Nov 2013 15:59:40 +0800 Subject: [PATCH 1/3] add func InsertFilter(pattern string, pos int, filter FilterFunc) *App to replace AddFilter pos can be const: BeforeRouter = iota AfterStatic BeforeExec AfterExec FinishRouter --- app.go | 5 +++++ beego.go | 7 +++++++ router.go | 59 +++++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/app.go b/app.go index 43b5e673..a33b6f77 100644 --- a/app.go +++ b/app.go @@ -96,6 +96,11 @@ func (app *App) Filter(pattern, action string, filter FilterFunc) *App { return app } +func (app *App) InsertFilter(pattern string, pos int, filter FilterFunc) *App { + app.Handlers.InsertFilter(pattern, pos, filter) + return app +} + func (app *App) SetViewsPath(path string) *App { ViewsPath = path return app diff --git a/beego.go b/beego.go index aa0dc85b..32fdffd0 100644 --- a/beego.go +++ b/beego.go @@ -49,6 +49,7 @@ func DelStaticPath(url string) *App { return BeeApp } +//!!DEPRECATED!! use InsertFilter //action has four values: //BeforRouter //AfterStatic @@ -59,6 +60,12 @@ func AddFilter(pattern, action string, filter FilterFunc) *App { return BeeApp } +func InsertFilter(pattern string, pos int, filter FilterFunc) *App { + BeeApp.InsertFilter(pattern, pos, filter) + return BeeApp +} + + func Run() { //if AppConfigPath not In the conf/app.conf reParse config if AppConfigPath != path.Join(AppPath, "conf", "app.conf") { diff --git a/router.go b/router.go index 1cf5b5cc..cbc5d298 100644 --- a/router.go +++ b/router.go @@ -16,6 +16,14 @@ import ( "time" ) +const ( + BeforeRouter = iota + AfterStatic + BeforeExec + AfterExec + FinishRouter +) + var HTTPMETHOD = []string{"get", "post", "put", "delete", "patch", "options", "head"} type controllerInfo struct { @@ -31,7 +39,7 @@ type ControllerRegistor struct { routers []*controllerInfo fixrouters []*controllerInfo enableFilter bool - filters map[string][]*FilterRouter + filters map[int][]*FilterRouter enableAuto bool autoRouter map[string]map[string]reflect.Type //key:controller key:method value:reflect.type } @@ -40,7 +48,7 @@ func NewControllerRegistor() *ControllerRegistor { return &ControllerRegistor{ routers: make([]*controllerInfo, 0), autoRouter: make(map[string]map[string]reflect.Type), - filters: make(map[string][]*FilterRouter), + filters: make(map[int][]*FilterRouter), } } @@ -215,17 +223,15 @@ func (p *ControllerRegistor) AddAuto(c ControllerInterface) { } // Filter adds the middleware filter. -func (p *ControllerRegistor) AddFilter(pattern, action string, filter FilterFunc) { - p.enableFilter = true +func buildFilter(pattern string, filter FilterFunc) *FilterRouter { mr := new(FilterRouter) mr.filterFunc = filter - parts := strings.Split(pattern, "/") j := 0 for i, part := range parts { if strings.HasPrefix(part, ":") { expr := "(.+)" - //a user may choose to override the defult expression + //a user may choose to override the default expression // similar to expressjs: ‘/user/:id([0-9]+)’ if index := strings.Index(part, "("); index != -1 { expr = part[index:] @@ -252,13 +258,36 @@ func (p *ControllerRegistor) AddFilter(pattern, action string, filter FilterFunc if regexErr != nil { //TODO add error handling here to avoid panic panic(regexErr) - return } mr.regex = regex mr.hasregex = true } mr.pattern = pattern - p.filters[action] = append(p.filters[action], mr) + return mr +} + +//p.filters[action] = append(p.filters[action], mr) +func (p *ControllerRegistor) AddFilter(pattern, action string, filter FilterFunc) { + mr := buildFilter(pattern, filter) + switch action { + case "BeforRouter": + p.filters[BeforeRouter] = append(p.filters[BeforeRouter], mr) + case "AfterStatic": + p.filters[AfterStatic] = append(p.filters[AfterStatic], mr) + case "BeforeExec": + p.filters[BeforeExec] = append(p.filters[BeforeExec], mr) + case "AfterExec": + p.filters[AfterExec] = append(p.filters[AfterExec], mr) + case "FinishRouter": + p.filters[FinishRouter] = append(p.filters[FinishRouter], mr) + } + p.enableFilter = true +} + +func (p *ControllerRegistor) InsertFilter(pattern string, filterPos int, filter FilterFunc) { + mr := buildFilter(pattern, filter) + p.filters[filterPos] = append(p.filters[filterPos], mr) + p.enableFilter = true } func (p *ControllerRegistor) UrlFor(endpoint string, values ...string) string { @@ -436,7 +465,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) } if p.enableFilter { - if l, ok := p.filters["BeforRouter"]; ok { + if l, ok := p.filters[BeforeRouter]; ok { for _, filterR := range l { if filterR.ValidRouter(r.URL.Path) { filterR.filterFunc(context) @@ -483,7 +512,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) } if p.enableFilter { - if l, ok := p.filters["AfterStatic"]; ok { + if l, ok := p.filters[AfterStatic]; ok { for _, filterR := range l { if filterR.ValidRouter(r.URL.Path) { filterR.filterFunc(context) @@ -558,7 +587,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) } //execute middleware filters if p.enableFilter { - if l, ok := p.filters["BeforExec"]; ok { + if l, ok := p.filters[BeforeExec]; ok { for _, filterR := range l { if filterR.ValidRouter(r.URL.Path) { filterR.filterFunc(context) @@ -713,7 +742,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) method.Call(in) //execute middleware filters if p.enableFilter { - if l, ok := p.filters["AfterExec"]; ok { + if l, ok := p.filters[AfterExec]; ok { for _, filterR := range l { if filterR.ValidRouter(r.URL.Path) { filterR.filterFunc(context) @@ -762,7 +791,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) findrouter = true //execute middleware filters if p.enableFilter { - if l, ok := p.filters["BeforExec"]; ok { + if l, ok := p.filters[BeforeExec]; ok { for _, filterR := range l { if filterR.ValidRouter(r.URL.Path) { filterR.filterFunc(context) @@ -817,7 +846,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) method.Call(in) //execute middleware filters if p.enableFilter { - if l, ok := p.filters["AfterExec"]; ok { + if l, ok := p.filters[AfterExec]; ok { for _, filterR := range l { if filterR.ValidRouter(r.URL.Path) { filterR.filterFunc(context) @@ -845,7 +874,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) Admin: if p.enableFilter { - if l, ok := p.filters["Finish"]; ok { + if l, ok := p.filters[FinishRouter]; ok { for _, filterR := range l { if filterR.ValidRouter(r.URL.Path) { filterR.filterFunc(context) From 8c3b936c604a4b6cbaf0d3b85e89283970030cee Mon Sep 17 00:00:00 2001 From: knightmare Date: Mon, 25 Nov 2013 16:04:02 +0800 Subject: [PATCH 2/3] replace filterPos to pos --- router.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/router.go b/router.go index cbc5d298..fe85bd8f 100644 --- a/router.go +++ b/router.go @@ -284,9 +284,9 @@ func (p *ControllerRegistor) AddFilter(pattern, action string, filter FilterFunc p.enableFilter = true } -func (p *ControllerRegistor) InsertFilter(pattern string, filterPos int, filter FilterFunc) { +func (p *ControllerRegistor) InsertFilter(pattern string, pos int, filter FilterFunc) { mr := buildFilter(pattern, filter) - p.filters[filterPos] = append(p.filters[filterPos], mr) + p.filters[pos] = append(p.filters[pos], mr) p.enableFilter = true } From b4fb657efd89ffca1a1059c55a804f8e1ce97aed Mon Sep 17 00:00:00 2001 From: knightmare Date: Mon, 25 Nov 2013 16:15:48 +0800 Subject: [PATCH 3/3] eliminated improper comments --- router.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/router.go b/router.go index fe85bd8f..05465ef2 100644 --- a/router.go +++ b/router.go @@ -222,7 +222,6 @@ func (p *ControllerRegistor) AddAuto(c ControllerInterface) { } } -// Filter adds the middleware filter. func buildFilter(pattern string, filter FilterFunc) *FilterRouter { mr := new(FilterRouter) mr.filterFunc = filter @@ -266,7 +265,6 @@ func buildFilter(pattern string, filter FilterFunc) *FilterRouter { return mr } -//p.filters[action] = append(p.filters[action], mr) func (p *ControllerRegistor) AddFilter(pattern, action string, filter FilterFunc) { mr := buildFilter(pattern, filter) switch action {