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

fix: gate gio file copy fallback with gvfs feature

Browse source
This commit is contained in:
Michael Aaron Murphy 2026-04-14 17:15:19 +02:00
parent e21989aaa3
commit 1c4ab75814
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/operation/recursive.rs
View file

@ -10,7 +10,6 @@ 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::{FutureExt, StreamExt}; use futures::{FutureExt, StreamExt};
use gio::prelude::FileExtManual;
use std::future::Future; use std::future::Future;
use std::pin::Pin; use std::pin::Pin;
use std::rc::Rc; use std::rc::Rc;
@ -18,10 +17,14 @@ use std::time::Instant;
use std::{cell::Cell, error::Error, fs, ops::ControlFlow, path::PathBuf}; use std::{cell::Cell, error::Error, fs, ops::ControlFlow, path::PathBuf};
use walkdir::WalkDir; use walkdir::WalkDir;
#[cfg(feature = "gvfs")]
use gio::prelude::FileExtManual;
#[derive(thiserror::Error, Debug)] #[derive(thiserror::Error, Debug)]
pub enum GioCopyError { pub enum GioCopyError {
#[error("controller state")] #[error("controller state")]
Controller(OperationError), Controller(OperationError),
#[cfg(feature = "gvfs")]
#[error("gio copy failed")] #[error("gio copy failed")]
GLib(#[from] glib::Error), GLib(#[from] glib::Error),
} }
@ -508,6 +511,7 @@ impl Op {
let buf_out = buf_out_slice.into_inner(); let buf_out = buf_out_slice.into_inner();
if let Err(why) = result { if let Err(why) = result {
#[cfg(feature = "gvfs")]
if let std::io::ErrorKind::Unsupported = why.kind() { if let std::io::ErrorKind::Unsupported = why.kind() {
ctx.buf = buf_out; ctx.buf = buf_out;
_ = futures::future::join(from_file.close(), to_file.close()).await; _ = futures::future::join(from_file.close(), to_file.close()).await;
@ -583,6 +587,7 @@ impl Op {
/// Fallback mechanism in the event that unsupported I/O error errors occur. /// Fallback mechanism in the event that unsupported I/O error errors occur.
/// Fixes unsupported errors when copying large files over MTP. /// Fixes unsupported errors when copying large files over MTP.
/// TODO: Find what Gio.File does to work around this. /// TODO: Find what Gio.File does to work around this.
#[cfg(feature = "gvfs")]
async fn gio_file_copy( async fn gio_file_copy(
&self, &self,
ctx: &mut Context, ctx: &mut Context,