mirror of
https://github.com/kataras/iris.git
synced 2025-01-23 02:31:04 +01:00
fix prev commit
This commit is contained in:
parent
a431a1c7d2
commit
23741e7209
|
@ -67,7 +67,7 @@ func TestRouterWildcardDifferentPrefixPath(t *testing.T) {
|
|||
}},
|
||||
}
|
||||
|
||||
testTheRoutes(t, tt, false)
|
||||
testTheRoutes(t, tt, true)
|
||||
}
|
||||
|
||||
func TestRouterWildcardAndStatic(t *testing.T) {
|
||||
|
@ -117,7 +117,7 @@ func TestRouterWildcardRootMany(t *testing.T) {
|
|||
}},
|
||||
}
|
||||
|
||||
testTheRoutes(t, tt, false)
|
||||
testTheRoutes(t, tt, true)
|
||||
}
|
||||
|
||||
func TestRouterWildcardRootManyAndRootStatic(t *testing.T) {
|
||||
|
|
|
@ -127,26 +127,32 @@ func (tr *trie) insert(path string, route context.RouteReadOnly, handlers contex
|
|||
|
||||
var paramKeys []string
|
||||
|
||||
for i, s := range input {
|
||||
for _, s := range input {
|
||||
if len(s) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
c := s[0]
|
||||
|
||||
if len(s)-1 > i+1 && s[i+1] != '/' { // has next character and it's not slash.
|
||||
// get the next character, if not slash then this is a parameter.
|
||||
if len(s) > 1 { // has more than one character.
|
||||
// get the next character, should be the name of the parameter.
|
||||
// E.g:
|
||||
// If /test/:param (or /test/*param) then it's dynamic.
|
||||
// If /test/: (or /test/*) then it's static.
|
||||
if c == paramStartCharacter {
|
||||
n.childNamedParameter = true
|
||||
s = ParamStart
|
||||
} else if c == wildcardParamStartCharacter {
|
||||
n.childWildcardParameter = true
|
||||
s = WildcardParamStart
|
||||
if tr.root == n {
|
||||
tr.hasRootWildcard = true
|
||||
if isParam, isWildcard := c == paramStartCharacter, c == wildcardParamStartCharacter; isParam || isWildcard {
|
||||
n.hasDynamicChild = true
|
||||
paramKeys = append(paramKeys, s[1:]) // without : or *.
|
||||
if isParam {
|
||||
n.childNamedParameter = true
|
||||
s = ParamStart
|
||||
}
|
||||
|
||||
if isWildcard {
|
||||
n.childWildcardParameter = true
|
||||
s = WildcardParamStart
|
||||
if tr.root == n {
|
||||
tr.hasRootWildcard = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user