dietrich/Pslink
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 1 Activity

delayed qr-code rendering

Browse Source
This commit is contained in:
Dietrich 2021-06-09 07:48:58 +02:00 committed by Franz Dietrich
parent 81cb5ab304
commit 6dfef53243
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/pages/list_links.rs
View File

@ -38,7 +38,8 @@ pub fn init(mut url: Url, orders: &mut impl Orders<Msg>, i18n: I18n) -> Model {
formconfig: LinkRequestForm::default(), // when requesting links the form is stored here formconfig: LinkRequestForm::default(), // when requesting links the form is stored here
inputs: EnumMap::default(), // the input fields for the searches inputs: EnumMap::default(), // the input fields for the searches
dialog, dialog,
handle: None, handle_render: None,
handle_timeout: None,
} }
} }
@ -49,7 +50,8 @@ pub struct Model {
formconfig: LinkRequestForm, // when requesting links the form is stored here formconfig: LinkRequestForm, // when requesting links the form is stored here
inputs: EnumMap<LinkOverviewColumns, FilterInput>, // the input fields for the searches inputs: EnumMap<LinkOverviewColumns, FilterInput>, // the input fields for the searches
dialog: Dialog, // User interaction - there can only ever be one dialog open. dialog: Dialog, // User interaction - there can only ever be one dialog open.
handle: Option<CmdHandle>, // Rendering qr-codes takes time... it is aborted when this handle is dropped and replaced. handle_render: Option<CmdHandle>, // Rendering qr-codes takes time... it is aborted when this handle is dropped and replaced.
handle_timeout: Option<CmdHandle>, // Rendering qr-codes takes time... it is aborted when this handle is dropped and replaced.
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -124,7 +126,8 @@ pub enum QueryMsg {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum EditMsg { pub enum EditMsg {
EditSelected(LinkDelta), EditSelected(LinkDelta),
QrGeneration(Loadable<QrGuard>), GenerateQr(String),
QrGenerated(Loadable<QrGuard>),
CreateNewLink, CreateNewLink,
Created(Status), Created(Status),
EditCodeChanged(String), EditCodeChanged(String),
@ -269,6 +272,7 @@ fn load_links(model: &Model, orders: &mut impl Orders<Msg>) {
} }
/// Process all the events related to editing links. /// Process all the events related to editing links.
#[allow(clippy::too_many_lines)]
pub fn process_edit_messages(msg: EditMsg, model: &mut Model, orders: &mut impl Orders<Msg>) { pub fn process_edit_messages(msg: EditMsg, model: &mut Model, orders: &mut impl Orders<Msg>) {
match msg { match msg {
EditMsg::EditSelected(link) => { EditMsg::EditSelected(link) => {
@ -277,16 +281,20 @@ pub fn process_edit_messages(msg: EditMsg, model: &mut Model, orders: &mut impl
link_delta: link_delta.clone(), link_delta: link_delta.clone(),
qr: Loadable::Data(None), qr: Loadable::Data(None),
}; };
log!("#loaded dialog"); let code = link_delta.code;
model.handle = Some(orders.perform_cmd_with_handle(async move { model.handle_render = None;
let qr_code = Loadable::Data(Some(QrGuard::new(&link_delta.code))); model.handle_timeout =
Msg::Edit(EditMsg::QrGeneration(qr_code)) Some(orders.perform_cmd_with_handle(cmds::timeout(1000, || {
})); Msg::Edit(EditMsg::GenerateQr(code))
orders.force_render_now(); })));
log!("#after async");
} }
EditMsg::QrGeneration(qr_code) => { EditMsg::GenerateQr(code) => {
log!("#In generate"); model.handle_render = Some(orders.perform_cmd_with_handle(async move {
let qr_code = Loadable::Data(Some(QrGuard::new(&code)));
Msg::Edit(EditMsg::QrGenerated(qr_code))
}))
}
EditMsg::QrGenerated(qr_code) => {
let new_dialog = if let Dialog::EditLink { let new_dialog = if let Dialog::EditLink {
ref link_delta, ref link_delta,
qr: _, qr: _,
@ -299,9 +307,6 @@ pub fn process_edit_messages(msg: EditMsg, model: &mut Model, orders: &mut impl
} else { } else {
None None
}; };
log!("#done generating");
if let Some(dialog) = new_dialog { if let Some(dialog) = new_dialog {
model.dialog = dialog; model.dialog = dialog;
} }
@ -320,14 +325,20 @@ pub fn process_edit_messages(msg: EditMsg, model: &mut Model, orders: &mut impl
} }
EditMsg::EditCodeChanged(s) => { EditMsg::EditCodeChanged(s) => {
if let Dialog::EditLink { if let Dialog::EditLink {
ref mut link_delta, .. mut link_delta,
} = model.dialog qr: _,
} = model.dialog.clone()
{ {
link_delta.code = s.clone(); link_delta.code = s.clone();
model.handle = Some(orders.perform_cmd_with_handle(async move { model.handle_render = None;
let qr_code = Loadable::Data(Some(QrGuard::new(&s))); model.handle_timeout =
Msg::Edit(EditMsg::QrGeneration(qr_code)) Some(orders.perform_cmd_with_handle(cmds::timeout(2000, || {
})); Msg::Edit(EditMsg::GenerateQr(s))
})));
model.dialog = Dialog::EditLink {
link_delta,
qr: Loadable::Loading,
};
} }
} }
EditMsg::EditDescriptionChanged(s) => { EditMsg::EditDescriptionChanged(s) => {
@ -361,9 +372,8 @@ pub fn process_edit_messages(msg: EditMsg, model: &mut Model, orders: &mut impl
model.dialog = Dialog::Question(link) model.dialog = Dialog::Question(link)
} }
EditMsg::DeleteSelected(link) => delete_link(link, orders), EditMsg::DeleteSelected(link) => delete_link(link, orders),
EditMsg::FailedToDeleteLink => { EditMsg::FailedToDeleteLink => log!("Failed to delete Link"),
log!("Failed to delete Link");
}
EditMsg::DeletedLink(message) => { EditMsg::DeletedLink(message) => {
clear_all(model); clear_all(model);
model.dialog = Dialog::Message(message); model.dialog = Dialog::Message(message);