-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gui: add a modal for export tasks in transactions panels
- Loading branch information
1 parent
5ea043b
commit f6925d8
Showing
9 changed files
with
331 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| use std::{ | ||
| path::PathBuf, | ||
| sync::{Arc, Mutex}, | ||
| }; | ||
|
|
||
| use iced::{Command, Subscription}; | ||
| use liana_ui::{component::modal::Modal, widget::Element}; | ||
| use tokio::task::JoinHandle; | ||
|
|
||
| use crate::app::{ | ||
| export::{self, get_path, ExportProgress, ExportType}, | ||
| message::Message, | ||
| view::{self, export::export_modal}, | ||
| }; | ||
| use crate::daemon::Daemon; | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub enum ExportMessage { | ||
| Open, | ||
| ExportProgress(ExportProgress), | ||
| TimedOut, | ||
| UserStop, | ||
| Path(Option<PathBuf>), | ||
| Close, | ||
| } | ||
|
|
||
| impl From<ExportMessage> for view::Message { | ||
| fn from(value: ExportMessage) -> Self { | ||
| Self::Export(value) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, PartialEq)] | ||
| pub enum ExportState { | ||
| Init, | ||
| ChoosePath, | ||
| Path(PathBuf), | ||
| Started, | ||
| Progress(f32), | ||
| TimedOut, | ||
| Aborted, | ||
| Ended, | ||
| Closed, | ||
| } | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct ExportModal { | ||
| path: Option<PathBuf>, | ||
| handle: Option<Arc<Mutex<JoinHandle<()>>>>, | ||
| state: ExportState, | ||
| error: Option<export::Error>, | ||
| daemon: Arc<dyn Daemon + Sync + Send>, | ||
| } | ||
|
|
||
| impl ExportModal { | ||
| #[allow(clippy::new_without_default)] | ||
| pub fn new(daemon: Arc<dyn Daemon + Sync + Send>) -> Self { | ||
| Self { | ||
| path: None, | ||
| handle: None, | ||
| state: ExportState::Init, | ||
| error: None, | ||
| daemon, | ||
| } | ||
| } | ||
|
|
||
| pub fn launch(&mut self) -> Command<crate::app::message::Message> { | ||
| Command::perform(get_path(), |m| { | ||
| Message::View(view::Message::Export(ExportMessage::Path(m))) | ||
| }) | ||
| } | ||
|
|
||
| pub fn update(&mut self, message: crate::app::message::Message) -> Command<Message> { | ||
| if let crate::app::message::Message::View(view::Message::Export(m)) = message { | ||
| match m { | ||
| ExportMessage::ExportProgress(m) => match m { | ||
| ExportProgress::Started(_) => self.state = ExportState::Progress(0.0), | ||
| ExportProgress::Progress(p) => self.state = ExportState::Progress(p), | ||
| ExportProgress::Finnished | ExportProgress::Ended => { | ||
| self.state = ExportState::Ended | ||
| } | ||
| ExportProgress::Error(e) => self.error = Some(e), | ||
| ExportProgress::None => {} | ||
| }, | ||
| ExportMessage::TimedOut => { | ||
| self.stop(ExportState::TimedOut); | ||
| } | ||
| ExportMessage::UserStop => { | ||
| self.stop(ExportState::Aborted); | ||
| } | ||
| ExportMessage::Path(p) => { | ||
| if let Some(path) = p { | ||
| self.path = Some(path); | ||
| self.start(); | ||
| } else { | ||
| return Command::perform(async {}, |_| { | ||
| Message::View(view::Message::Export(ExportMessage::Close)) | ||
| }); | ||
| } | ||
| } | ||
| ExportMessage::Close | ExportMessage::Open => { /* unreachable */ } | ||
| } | ||
| Command::none() | ||
| } else { | ||
| Command::none() | ||
| } | ||
| } | ||
| pub fn view<'a>(&'a self, content: Element<'a, view::Message>) -> Element<view::Message> { | ||
| let modal = Modal::new( | ||
| content, | ||
| export_modal(&self.state, self.error.as_ref(), "Transactions"), | ||
| ); | ||
| match self.state { | ||
| ExportState::TimedOut | ||
| | ExportState::Aborted | ||
| | ExportState::Ended | ||
| | ExportState::Closed => modal.on_blur(Some(view::Message::Close)), | ||
| _ => modal, | ||
| } | ||
| .into() | ||
| } | ||
|
|
||
| pub fn start(&mut self) { | ||
| self.state = ExportState::Started; | ||
| } | ||
|
|
||
| pub fn stop(&mut self, state: ExportState) { | ||
| if let Some(handle) = self.handle.take() { | ||
| handle.lock().expect("poisoined").abort(); | ||
| self.state = state; | ||
| } | ||
| } | ||
|
|
||
| pub fn subscription(&self) -> Option<Subscription<export::ExportProgress>> { | ||
| if let Some(path) = &self.path { | ||
| match &self.state { | ||
| ExportState::Started | ExportState::Progress(_) => { | ||
| Some(iced::subscription::unfold( | ||
| "transactions", | ||
| export::ExportState::new( | ||
| self.daemon.clone(), | ||
| ExportType::Transactions, | ||
| Box::new(path.to_path_buf()), | ||
| ), | ||
| export::export_subscription, | ||
| )) | ||
| } | ||
| _ => None, | ||
| } | ||
| } else { | ||
| None | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| mod coins; | ||
| pub mod export; | ||
| mod label; | ||
| mod psbt; | ||
| mod psbts; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.