james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-12-15 08:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

make route handling better

Browse Source
This commit is contained in:
hcl
2021-01-25 23:28:52 +08:00
committed by nkanaev
parent 4f79c919f0
commit 52073e7e81
4 changed files with 40 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/router.go
View File

@@ -35,13 +35,13 @@ func p(path string, handler func(http.ResponseWriter, *http.Request)) Route {
}
}
func getRoute(req *http.Request) (*Route, map[string]string) {
func getRoute(reqPath string) (*Route, map[string]string) {
vars := make(map[string]string)
for _, route := range routes {
if route.urlRegex.MatchString(req.URL.Path) {
matches := route.urlRegex.FindStringSubmatchIndex(req.URL.Path)
if route.urlRegex.MatchString(reqPath) {
matches := route.urlRegex.FindStringSubmatchIndex(reqPath)
for i, key := range route.urlRegex.SubexpNames()[1:] {
vars[key] = req.URL.Path[matches[i*2+2]:matches[i*2+3]]
vars[key] = reqPath[matches[i*2+2]:matches[i*2+3]]
}
return &route, vars
}