go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-02-02 23:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a bug on router/path

Browse Source 
- Stored the args length on a variable instead of three consecutive calls to the len method on "toStringSlice" function;
- Improved readability on "toStringSlice" function;
- Fixed a bug on "URL", which all routes without parameters would not return the full uri (just the path);

Former-commit-id: 3ddd8869087aa9046bdb874f98985b76daaa249e
This commit is contained in:
honux 2017-12-02 17:45:43 -02:00 committed by GitHub
parent 988cb2cab6
commit 9197fd7349
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/router/path.go
View File

@ -209,12 +209,13 @@ func (ps *RoutePathReverser) Path(routeName string, paramValues ...interface{})
return r.ResolvePath(toStringSlice(paramValues)...) return r.ResolvePath(toStringSlice(paramValues)...)
} }
func toStringSlice(args []interface{}) []string { func toStringSlice(args []interface{}) (argsString []string) {
var argsString []string argsSize := len(args)
if len(args) > 0 { if argsSize <= 0 {
argsString = make([]string, len(args), len(args)) return
} }
argsString = make([]string, argsSize, argsSize)
for i, v := range args { for i, v := range args {
if s, ok := v.(string); ok { if s, ok := v.(string); ok {
argsString[i] = s argsString[i] = s
@ -229,7 +230,7 @@ func toStringSlice(args []interface{}) []string {
} }
} }
} }
return argsString return
} }
// Remove the URL for now, it complicates things for the whole framework without a specific benefits, // Remove the URL for now, it complicates things for the whole framework without a specific benefits,
@ -246,21 +247,16 @@ func (ps *RoutePathReverser) URL(routeName string, paramValues ...interface{}) (
return return
} }
if len(paramValues) == 0 {
return r.Path
}
args := toStringSlice(paramValues)
host := ps.vhost host := ps.vhost
scheme := ps.vscheme scheme := ps.vscheme
args := toStringSlice(paramValues)
// if it's dynamic subdomain then the first argument is the subdomain part // if it's dynamic subdomain then the first argument is the subdomain part
// for this part we are responsible not the custom routers // for this part we are responsible not the custom routers
if r.Subdomain == SubdomainWildcardIndicator { if len(args) > 0 && r.Subdomain == SubdomainWildcardIndicator {
subdomain := args[0] subdomain := args[0]
host = subdomain + "." + host host = subdomain + "." + host
args = args[1:] // remove the subdomain part for the arguments, args = args[1:] // remove the subdomain part for the arguments,
} }
if parsedPath := r.ResolvePath(args...); parsedPath != "" { if parsedPath := r.ResolvePath(args...); parsedPath != "" {