actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-01-18 05:41:50 +01:00
Code Issues Releases Wiki Activity

better path recognision

Browse Source
This commit is contained in:
Nikolay Kim 2017-10-27 19:26:53 -07:00
parent fb0270e27d
commit 76ffc60971
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/recognizer.rs
View File

@ -57,17 +57,26 @@ impl<T> RouteRecognizer<T> {
} }
pub fn set_prefix<P: ToString>(&mut self, prefix: P) { pub fn set_prefix<P: ToString>(&mut self, prefix: P) {
self.prefix = prefix.to_string().len() - 1; let p = prefix.to_string();
if p.ends_with('/') {
self.prefix = p.len() - 1;
} else {
self.prefix = p.len();
}
} }
pub fn recognize(&self, path: &str) -> Option<(Option<Params>, &T)> { pub fn recognize(&self, path: &str) -> Option<(Option<Params>, &T)> {
if let Some(idx) = self.patterns.matches(&path[self.prefix..]).into_iter().next() let p = &path[self.prefix..];
{ if p.is_empty() {
if let Some(idx) = self.patterns.matches("/").into_iter().next() {
let (ref pattern, ref route) = self.routes[idx]; let (ref pattern, ref route) = self.routes[idx];
Some((pattern.match_info(&path[self.prefix..]), route)) return Some((pattern.match_info(&path[self.prefix..]), route))
} else {
None
} }
} else if let Some(idx) = self.patterns.matches(p).into_iter().next() {
let (ref pattern, ref route) = self.routes[idx];
return Some((pattern.match_info(&path[self.prefix..]), route))
}
None
} }
} }