From 81cb5ab304f7f29e66339710b5d807433a49f43f Mon Sep 17 00:00:00 2001 From: Dietrich Date: Tue, 8 Jun 2021 06:59:20 +0200 Subject: [PATCH] fix warnings --- app/src/pages/list_links.rs | 66 +++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/app/src/pages/list_links.rs b/app/src/pages/list_links.rs index 3c15903..a20d12b 100644 --- a/app/src/pages/list_links.rs +++ b/app/src/pages/list_links.rs @@ -92,7 +92,8 @@ impl QrGuard { impl Drop for QrGuard { fn drop(&mut self) { - let _ = web_sys::Url::revoke_object_url(&self.url); + web_sys::Url::revoke_object_url(&self.url) + .unwrap_or_else(|_| (log!("Failed to release url!"))); } } @@ -359,37 +360,7 @@ pub fn process_edit_messages(msg: EditMsg, model: &mut Model, orders: &mut impl clear_all(model); model.dialog = Dialog::Question(link) } - EditMsg::DeleteSelected(link) => { - orders.perform_cmd(async { - let data = link; - // create the request - let request = unwrap_or_return!( - Request::new("/admin/json/delete_link/") - .method(Method::Post) - .json(&data), - Msg::SetMessage("serialization failed".to_string()) - ); - // perform the request and recieve a respnse - let response = - unwrap_or_return!(fetch(request).await, Msg::Edit(EditMsg::FailedToDeleteLink)); - - // check the status of the response - let response = unwrap_or_return!( - response.check_status(), - Msg::SetMessage("Wrong response code!".to_string()) - ); - // deserialize the response - let message: Status = unwrap_or_return!( - response.json().await, - Msg::SetMessage( - "Failed to parse the response! The link might or might not be deleted!" - .to_string() - ) - ); - - Msg::Edit(EditMsg::DeletedLink(message)) - }); - } + EditMsg::DeleteSelected(link) => delete_link(link, orders), EditMsg::FailedToDeleteLink => { log!("Failed to delete Link"); } @@ -435,6 +406,37 @@ fn save_link(link_delta: LinkDelta, orders: &mut impl Orders) { }); } +/// Send a link delete request to the server. +fn delete_link(link_delta: LinkDelta, orders: &mut impl Orders) { + orders.perform_cmd(async move { + // create the request + let request = unwrap_or_return!( + Request::new("/admin/json/delete_link/") + .method(Method::Post) + .json(&link_delta), + Msg::SetMessage("serialization failed".to_string()) + ); + // perform the request and recieve a respnse + let response = + unwrap_or_return!(fetch(request).await, Msg::Edit(EditMsg::FailedToDeleteLink)); + + // check the status of the response + let response = unwrap_or_return!( + response.check_status(), + Msg::SetMessage("Wrong response code!".to_string()) + ); + // deserialize the response + let message: Status = unwrap_or_return!( + response.json().await, + Msg::SetMessage( + "Failed to parse the response! The link might or might not be deleted!".to_string() + ) + ); + + Msg::Edit(EditMsg::DeletedLink(message)) + }); +} + /// view the page /// * messages /// * questions