From 2f02653b7db07326fc0b6da9c7984df606199a36 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Tue, 9 Apr 2013 23:33:48 +0800
Subject: [PATCH] add GetFIle & enhance router

---
 controller.go |  5 +++++
 router.go     | 30 +++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/controller.go b/controller.go
index 65ff92d4..975ca424 100644
--- a/controller.go
+++ b/controller.go
@@ -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
diff --git a/router.go b/router.go
index 7b0c3c60..2081309c 100644
--- a/router.go
+++ b/router.go
@@ -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) {