wathiede/letterbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Wiki Activity

web: remove some unused code

Browse Source
This commit is contained in:
Bill Thiede 2023-12-02 09:34:26 -08:00
parent 0a7cdefda3
commit ef8362d6f2
2 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/src/api.rs
View File

@ -1,7 +1,6 @@
use log::info; use log::info;
use notmuch::ThreadSet; use notmuch::ThreadSet;
use seed::{prelude::*, Url}; use seed::{prelude::*, Url};
use serde::de::Deserialize;
const BASE_URL: &str = "/api"; const BASE_URL: &str = "/api";
pub fn refresh() -> String { pub fn refresh() -> String {
@ -11,9 +10,6 @@ pub fn search(query: &str, page: usize, results_per_page: usize) -> String {
let query = Url::encode_uri_component(query); let query = Url::encode_uri_component(query);
format!("{BASE_URL}/search/{query}?page={page}&results_per_page={results_per_page}") format!("{BASE_URL}/search/{query}?page={page}&results_per_page={results_per_page}")
} }
pub fn show(tid: &str) -> String {
format!("{BASE_URL}/show/{tid}")
}
pub fn show_pretty(tid: &str) -> String { pub fn show_pretty(tid: &str) -> String {
format!("{BASE_URL}/show/{tid}/pretty") format!("{BASE_URL}/show/{tid}/pretty")
} }
@ -61,20 +57,6 @@ pub async fn refresh_request() -> fetch::Result<()> {
Ok(()) Ok(())
} }
pub async fn show_request(tid: &str) -> fetch::Result<ThreadSet> {
let b = Request::new(show(tid))
.method(Method::Get)
.fetch()
.await?
.check_status()?
.bytes()
.await?;
let mut deserializer = serde_json::Deserializer::from_slice(&b);
deserializer.disable_recursion_limit();
Ok(ThreadSet::deserialize(&mut deserializer)
.map_err(|_| FetchError::JsonError(fetch::JsonError::Serde(JsValue::NULL)))?)
}
pub async fn show_pretty_request(tid: &str) -> fetch::Result<ThreadSet> { pub async fn show_pretty_request(tid: &str) -> fetch::Result<ThreadSet> {
Request::new(show_pretty(tid)) Request::new(show_pretty(tid))
.method(Method::Get) .method(Method::Get)

16
web/src/state.rs
View File

@ -147,19 +147,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
error!("fetch failed {:?}", fetch_error); error!("fetch failed {:?}", fetch_error);
} }
Msg::ShowRequest(tid) => {
orders
.skip()
.perform_cmd(async move { Msg::ShowResult(api::show_request(&tid).await) });
}
Msg::ShowResult(Ok(response_data)) => {
debug!("fetch ok {:#?}", response_data);
model.context = Context::Thread(response_data);
}
Msg::ShowResult(Err(fetch_error)) => {
error!("fetch failed {:?}", fetch_error);
}
Msg::ShowPrettyRequest(tid) => { Msg::ShowPrettyRequest(tid) => {
orders.skip().perform_cmd(async move { orders.skip().perform_cmd(async move {
Msg::ShowPrettyResult(api::show_pretty_request(&tid).await) Msg::ShowPrettyResult(api::show_pretty_request(&tid).await)
@ -327,6 +314,7 @@ pub struct Model {
} }
#[derive(Error, Debug)] #[derive(Error, Debug)]
#[allow(dead_code)] // Remove once the UI is showing errors
pub enum UIError { pub enum UIError {
#[error("No error, this should never be presented to user")] #[error("No error, this should never be presented to user")]
NoError, NoError,
@ -378,8 +366,6 @@ pub enum Msg {
results_per_page: usize, results_per_page: usize,
}, },
SearchResult(fetch::Result<shared::SearchResult>), SearchResult(fetch::Result<shared::SearchResult>),
ShowRequest(String),
ShowResult(fetch::Result<ThreadSet>),
ShowPrettyRequest(String), ShowPrettyRequest(String),
ShowPrettyResult(fetch::Result<ThreadSet>), ShowPrettyResult(fetch::Result<ThreadSet>),
NextPage, NextPage,