Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix export subscription #1580

Merged
merged 4 commits into from
Mar 4, 2025
Merged

Fix export subscription #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85024d6
gui: ExportModal.update() pass an ExportMessage instead app::message:…
pythcoiner Mar 2, 2025
3513226
gui: fix the export subscription being stuck in Running state
pythcoiner Mar 2, 2025
aa0c5d3
gui: minor cleanup in export_subscription()
pythcoiner Mar 2, 2025
a12bb0b
gui: add logs when export_subscription() fail to send a message
pythcoiner Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 33 additions & 39 deletions liana-gui/src/app/state/export.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use tokio::task::JoinHandle;

use crate::{
app::{
message::Message,
self,
view::{self, export::export_modal},
},
daemon::Daemon,
Expand Down Expand Up @@ -37,53 +37,47 @@ impl ExportModal {
}
}

pub fn launch(&self) -> Task<Message> {
pub fn launch(&self) -> Task<app::message::Message> {
Task::perform(get_path(), |m| {
Message::View(view::Message::Export(ExportMessage::Path(m)))
app::message::Message::View(view::Message::Export(ExportMessage::Path(m)))
})
}

pub fn update(&mut self, message: Message) -> Task<Message> {
if let Message::View(view::Message::Export(m)) = message {
match m {
ExportMessage::ExportProgress(m) => match m {
ExportProgress::Started(handle) => {
self.handle = Some(handle);
self.state = ExportState::Progress(0.0);
}
ExportProgress::Progress(p) => {
if let ExportState::Progress(_) = self.state {
self.state = ExportState::Progress(p);
}
}
ExportProgress::Finished | 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);
pub fn update(&mut self, message: ExportMessage) -> Task<app::message::Message> {
match message {
ExportMessage::ExportProgress(m) => match m {
ExportProgress::Started(handle) => {
self.handle = Some(handle);
self.state = ExportState::Progress(0.0);
}
ExportMessage::Path(p) => {
if let Some(path) = p {
self.path = Some(path);
self.start();
} else {
return Task::perform(async {}, |_| {
Message::View(view::Message::Export(ExportMessage::Close))
});
ExportProgress::Progress(p) => {
if let ExportState::Progress(_) = self.state {
self.state = ExportState::Progress(p);
}
}
ExportMessage::Close | ExportMessage::Open => { /* unreachable */ }
ExportProgress::Finished | ExportProgress::Ended => self.state = ExportState::Ended,
ExportProgress::Error(e) => self.error = Some(e),
ExportProgress::None => {}
},
ExportMessage::TimedOut => {
self.stop(ExportState::TimedOut);
}
Task::none()
} else {
Task::none()
ExportMessage::UserStop => {
self.stop(ExportState::Aborted);
}
ExportMessage::Path(p) => {
if let Some(path) = p {
self.path = Some(path);
self.start();
} else {
return Task::perform(async {}, |_| {
app::message::Message::View(view::Message::Export(ExportMessage::Close))
});
}
}
ExportMessage::Close | ExportMessage::Open => { /* unreachable */ }
}
Task::none()
}
pub fn view<'a>(&'a self, content: Element<'a, view::Message>) -> Element<view::Message> {
let modal = Modal::new(
Expand Down
10 changes: 8 additions & 2 deletions liana-gui/src/app/state/transactions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,16 @@ impl State for TransactionsPanel {
self.modal = TransactionsModal::None;
}
}
_ => {
ref msg => {
return match &mut self.modal {
TransactionsModal::CreateRbf(modal) => modal.update(daemon, _cache, message),
TransactionsModal::Export(modal) => modal.update(message),
TransactionsModal::Export(modal) => {
if let Message::View(view::Message::Export(m)) = msg {
modal.update(m.clone())
} else {
Task::none()
}
}
TransactionsModal::None => Task::none(),
};
}
Expand Down
19 changes: 10 additions & 9 deletions liana-gui/src/export.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,15 +359,14 @@ pub fn export_subscription(
Status::Stopped => {
break;
}
Status::Running => {
sleep(time::Duration::from_millis(100)).await;
continue;
}
Status::Running => {}
}
let msg = state.receiver.try_recv();
let disconnected = match msg {
Ok(m) => {
let _ = output.send(m).await;
if let Err(e) = output.send(m).await {
tracing::error!("export_subscription() fail to send message: {}", e);
}
continue;
}
Err(e) => match e {
Expand All @@ -379,7 +378,9 @@ pub fn export_subscription(
let handle = match state.handle.take() {
Some(h) => h,
None => {
let _ = output.send(ExportProgress::Error(Error::HandleLost)).await;
if let Err(e) = output.send(ExportProgress::Error(Error::HandleLost)).await {
tracing::error!("export_subscription() fail to send message: {}", e);
}
continue;
}
};
Expand All @@ -394,14 +395,14 @@ pub fn export_subscription(
}
};
if let Some(msg) = msg {
let _ = output.send(msg).await;
if let Err(e) = output.send(msg).await {
tracing::error!("export_subscription() fail to send message: {}", e);
}
continue;
}
// => release handle lock
state.handle = Some(handle);

sleep(time::Duration::from_millis(100)).await;
let _ = output.send(ExportProgress::None).await;
}
})
}
Expand Down
Loading