correction if let multiple

pull/30/head
Nicolas Sanchez 3 years ago
parent 7d6b17eb14
commit 2ff1bd0d7a

@ -27,18 +27,26 @@ struct QueryParams {
pub fromPage: Option<String>, pub fromPage: Option<String>,
} }
fn new_page_text(page_name: String, domain_from: &Option<String>, page_from: &Option<String>) -> String { fn new_page_text(
page_name: String,
domain_from: &Option<String>,
page_from: &Option<String>,
) -> String {
let mut retour = String::from(""); let mut retour = String::from("");
if let Some(domain_f) = domain_from { if let (Some(domain_f), Some(page_f)) = (domain_from, page_from) {
if let Some(page_f) = page_from { retour = format!("[retour](/{}/{})\n", domain_f, page_f);
retour = format!("[retour](/{}/{})\n", domain_f, page_f);
}
} }
retour + "# " + page_name.replace("_", " ").as_str() retour + "# " + page_name.replace("_", " ").as_str()
} }
async fn get_data(data: &web::Data<AppData>, domain: String, page_name: String, params: &Query<QueryParams>) -> String { async fn get_data(
let fut_page_datas = db::get_page_by_name(&data.db_pool, domain.to_owned(), page_name.to_owned()); data: &web::Data<AppData>,
domain: String,
page_name: String,
params: &Query<QueryParams>,
) -> String {
let fut_page_datas =
db::get_page_by_name(&data.db_pool, domain.to_owned(), page_name.to_owned());
let page_datas = fut_page_datas.await.unwrap(); let page_datas = fut_page_datas.await.unwrap();
match page_datas.first() { match page_datas.first() {
None => new_page_text(page_name, &params.fromDomain, &params.fromPage), None => new_page_text(page_name, &params.fromDomain, &params.fromPage),

Loading…
Cancel
Save