aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make url! work better

Browse Source 
there is still some issue with `None`, and an error making no sense at
some place
This commit is contained in:
Trinity Pointard 2019-07-22 22:15:25 +02:00 committed by Igor Galić
parent 6cd8bd89b2
commit c5f6b88b1d
No known key found for this signature in database
GPG Key ID: ACFEFF7F6A123A86
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/template_utils.rs
View File

@ -360,23 +360,32 @@ macro_rules! input {
/// function (most likely custom_domain or _custom_domain) /// function (most likely custom_domain or _custom_domain)
macro_rules! url { macro_rules! url {
($custom_domain:ident=$domain:expr, $module:ident::$route:ident: ($custom_domain:ident=$domain:expr, $module:ident::$route:ident:
common=[$($common_args:ident = $common_val:expr),*], common=[$($common_args:tt = $common_val:expr),*],
normal=[$($normal_args:ident = $normal_val:expr),*], normal=[$($normal_args:tt = $normal_val:expr),*],
custom=[$($custom_args:ident = $custom_val:expr),*]) => {{ custom=[$($custom_args:tt = $custom_val:expr),*]) => {{
let domain: Option<&str> = $domain; //for type inference with None let domain: Option<&plume_models::blogs::Host> = $domain.as_ref(); //for type inference with None
$(
let $common_args = $common_val;
)*
if let Some(domain) = domain { if let Some(domain) = domain {
$(
let $custom_args = $custom_val;
)*
let origin = uri!(crate::routes::$module::custom::$route: let origin = uri!(crate::routes::$module::custom::$route:
$custom_domain=&domain, $custom_domain = domain.as_ref(),
$($common_args = $common_val,)* $($common_args = $common_args,)*
$($custom_args = $custom_val,)* $($custom_args = $custom_args,)*
); );
let path = origin.segments().skip(1).map(|seg| format!("/{}", seg)).collect::<String>(); //first segment is domain, drop it let path = origin.segments().skip(1).map(|seg| format!("/{}", seg)).collect::<String>(); //first segment is domain, drop it
let query = origin.query().map(|q| format!("?{}", q)).unwrap_or_default(); let query = origin.query().map(|q| format!("?{}", q)).unwrap_or_default();
format!("https://{}{}{}", &domain, path, query) format!("https://{}{}{}", &domain, path, query)
} else { } else {
$(
let $normal_args = $normal_val;
)*
url!($module::$route: url!($module::$route:
$($common_args = $common_val,)* $($common_args = $common_args,)*
$($normal_args = $normal_val,)*) $($normal_args = $normal_args,)*)
.to_string() .to_string()
} }
}}; }};