berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

fix

This commit is contained in:
Ali MJ Al-Nasrawy 2021-06-27 12:12:16 +03:00
parent 7c006e465d
commit 66a77b6b4c
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
actix-router/src/resource.rs
View File

@ -56,7 +56,7 @@ impl ResourceDef {
let mut re_set = Vec::new(); let mut re_set = Vec::new();
for path in set { for path in set {
let (pattern, _, _, len) = ResourceDef::parse(&path, false); let (pattern, _, _, len) = ResourceDef::parse(&path, false, true);
let re = match Regex::new(&pattern) { let re = match Regex::new(&pattern) {
Ok(re) => re, Ok(re) => re,
@ -116,7 +116,7 @@ impl ResourceDef {
/// Parse path pattern and create new `Pattern` instance with custom prefix /// Parse path pattern and create new `Pattern` instance with custom prefix
fn with_prefix(path: &str, for_prefix: bool) -> Self { fn with_prefix(path: &str, for_prefix: bool) -> Self {
let path = path.to_owned(); let path = path.to_owned();
let (pattern, elements, is_dynamic, len) = ResourceDef::parse(&path, for_prefix); let (pattern, elements, is_dynamic, len) = ResourceDef::parse(&path, for_prefix, false);
let tp = if is_dynamic { let tp = if is_dynamic {
let re = match Regex::new(&pattern) { let re = match Regex::new(&pattern) {
@ -573,19 +573,15 @@ impl ResourceDef {
fn parse( fn parse(
mut pattern: &str, mut pattern: &str,
mut for_prefix: bool, mut for_prefix: bool,
force_dynamic: bool,
) -> (String, Vec<PatternElement>, bool, usize) { ) -> (String, Vec<PatternElement>, bool, usize) {
if pattern.find('{').is_none() { if !force_dynamic && pattern.find('{').is_none() && !pattern.ends_with('*') {
return if let Some(path) = pattern.strip_suffix('*') { return (
let re = format!("{}^{}(.*)", REGEX_FLAGS, path); String::from(pattern),
(re, vec![PatternElement::Str(String::from(path))], true, 0) vec![PatternElement::Str(String::from(pattern))],
} else { false,
( pattern.chars().count(),
String::from(pattern), );
vec![PatternElement::Str(String::from(pattern))],
false,
pattern.chars().count(),
)
};
} }
let mut elements = Vec::new(); let mut elements = Vec::new();
@ -607,6 +603,13 @@ impl ResourceDef {
dyn_elements += 1; dyn_elements += 1;
} }
if let Some(path) = pattern.strip_suffix('*') {
elements.push(PatternElement::Str(String::from(path)));
re.push_str(&escape(path));
re.push_str("(.*)");
pattern = "";
}
elements.push(PatternElement::Str(String::from(pattern))); elements.push(PatternElement::Str(String::from(pattern)));
re.push_str(&escape(pattern)); re.push_str(&escape(pattern));