OMGeeky/google-apis-rs
1
0
Fork 0
mirror of https://github.com/OMGeeky/google-apis-rs.git synced 2026-01-02 17:42:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(doit): simplify URL_ENCODE handling

Browse Source 
More maintainable template code, with less redundancy.
This commit is contained in:
Sebastian Thiel
2015-03-17 19:21:12 +01:00
parent 1fee21de24
commit d2bf24ca85
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/mako/lib/mbuild.mako
View File

@@ -532,20 +532,23 @@ else {
}
% endif
## Hanlde URI Tempates
% if replacements:
for &(find_this, param_name) in [${', '.join('("%s", "%s")' % r for r in replacements)}].iter() {
% if URL_ENCODE in special_cases:
let mut replace_with = String::new();
% else:
let mut replace_with: Option<<&str> = None;
% endif
<%
replace_init = ': Option<&str> = None'
replace_assign = 'Some(value)'
url_replace_arg = 'replace_with.expect("to find substitution value in params")'
if URL_ENCODE in special_cases:
replace_init = ' = String::new()'
replace_assign = 'value.to_string()'
url_replace_arg = '&replace_with'
# end handle url encoding
%>\
let mut replace_with${replace_init};
for &(name, ref value) in params.iter() {
if name == param_name {
% if URL_ENCODE in special_cases:
replace_with = value.to_string();
% else:
replace_with = Some(value);
% endif
replace_with = ${replace_assign};
break;
}
}
@@ -553,10 +556,8 @@ else {
if find_this.as_bytes()[1] == '+' as u8 {
replace_with = percent_encode(replace_with.as_bytes(), FORM_URLENCODED_ENCODE_SET);
}
url = url.replace(find_this, &replace_with);
% else:
url = url.replace(find_this, replace_with.expect("to find substitution value in params"));
% endif
url = url.replace(find_this, ${url_replace_arg});
}
## Remove all used parameters
{