leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: use select macro for gio copy futures

Browse source
This commit is contained in:
Michael Aaron Murphy 2026-04-14 16:51:21 +02:00
parent e35d5123f0
commit 0bd20e57e7
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/operation/recursive.rs
View file

@ -9,7 +9,6 @@ use compio::buf::{IntoInner, IoBuf};
use compio::driver::{ToSharedFd, op::AsyncifyFd}; use compio::driver::{ToSharedFd, op::AsyncifyFd};
use compio::io::{AsyncReadAt, AsyncWriteAt}; use compio::io::{AsyncReadAt, AsyncWriteAt};
use cosmic::iced::futures; use cosmic::iced::futures;
use futures::future::Either;
use futures::{FutureExt, StreamExt}; use futures::{FutureExt, StreamExt};
use gio::prelude::FileExtManual; use gio::prelude::FileExtManual;
use std::future::Future; use std::future::Future;
@ -608,10 +607,11 @@ impl Op {
glib::Priority::LOW, glib::Priority::LOW,
); );
let mut copy_fut = let mut copy_fut = gio_copy_fut
gio_copy_fut.map(|result| result.map_err(GioCopyError::GLib)); .map(|result| result.map_err(GioCopyError::GLib))
.fuse();
let mut progress_fut = std::pin::pin!(async { let progress_fut = std::pin::pin!(async {
while let Some((current_bytes, _)) = progress_stream.next().await { while let Some((current_bytes, _)) = progress_stream.next().await {
_ = progress_tx.send(current_bytes); _ = progress_tx.send(current_bytes);
} }
@ -620,31 +620,23 @@ impl Op {
futures::future::pending::<()>().await; futures::future::pending::<()>().await;
}); });
// Poll the progress future while waiting for the copy future to finish. let mut progress_fut = progress_fut.fuse();
let mut main_fut = std::pin::pin!(async {
loop {
if let Either::Right((result, _)) =
futures::future::select(&mut progress_fut, &mut copy_fut).await
{
return result;
}
}
});
let mut pause_rx2 = pause_rx.clone(); let mut pause_rx2 = pause_rx.clone();
loop { loop {
let until_paused = std::pin::pin!(pause_rx.wait_for(|paused| *paused)); let until_paused = std::pin::pin!(pause_rx.wait_for(|paused| *paused));
match futures::future::select(until_paused, &mut main_fut).await { futures::select! {
Either::Left(_) => { _ = &mut progress_fut => {},
_ = pause_rx2.wait_for(|paused| !*paused).await;
}
Either::Right((result, _)) => { result = &mut copy_fut => {
_ = tx.send(result.map(|_| ())); _ = tx.send(result.map(|_| ()));
glib_loop2.quit(); glib_loop2.quit();
return; return;
} }
_ = until_paused.fuse() => {
_ = pause_rx2.wait_for(|paused| !*paused).await;
}
} }
} }
}); });
@ -659,7 +651,6 @@ impl Op {
loop { loop {
let until_paused = std::pin::pin!(ctx.controller.until_paused()); let until_paused = std::pin::pin!(ctx.controller.until_paused());
futures::select! { futures::select! {
value = progress_rx.recv().fuse() => { value = progress_rx.recv().fuse() => {
if let Some(current_bytes) = value { if let Some(current_bytes) = value {
@ -668,9 +659,6 @@ impl Op {
if current.duration_since(last_progress_update).as_millis() > 49 { if current.duration_since(last_progress_update).as_millis() > 49 {
last_progress_update = current; last_progress_update = current;
(ctx.on_progress)(self, &progress); (ctx.on_progress)(self, &progress);
tracing::info!("checking controller");
// Also check if the progress was cancelled. // Also check if the progress was cancelled.
if let Err(state) = ctx.controller.check().await { if let Err(state) = ctx.controller.check().await {
tracing::warn!( tracing::warn!(