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

extend remote location filesystem detection filter

Browse source
This commit is contained in:
Frederic Laing 2025-11-17 09:27:26 +01:00
parent 0fc6596681
commit c8f25472a7
No known key found for this signature in database
GPG key ID: C126157F0CDCD306
2 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/mounter/gvfs.rs
View file

@ -40,9 +40,7 @@ fn items(monitor: &gio::VolumeMonitor, sizes: IconSizes) -> MounterItems {
gio::Cancellable::NONE, gio::Cancellable::NONE,
) )
.ok() .ok()
.and_then(|info| { .and_then(|info| Some(info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE)))
Some(info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE))
})
.unwrap_or(true); // Default to remote if query fails .unwrap_or(true); // Default to remote if query fails
MounterItem::Gvfs(Item { MounterItem::Gvfs(Item {

31
src/tab.rs
View file

@ -540,11 +540,34 @@ pub fn fs_kind(metadata: &Metadata) -> FsKind {
let major = major_str.parse::<libc::c_uint>().ok()?; let major = major_str.parse::<libc::c_uint>().ok()?;
let minor = minor_str.parse::<libc::c_uint>().ok()?; let minor = minor_str.parse::<libc::c_uint>().ok()?;
let dev = libc::makedev(major, minor); let dev = libc::makedev(major, minor);
//TODO: make sure this list is exhaustive // Network and distributed filesystem types
// Based on common remote filesystem types found in /proc/mounts
let kind = match mount_info.fs_type.as_str() { let kind = match mount_info.fs_type.as_str() {
"cifs" | "fuse.rclone" | "fuse.sshfs" | "nfs" | "nfs4" | "smb" // SMB/CIFS variants
| "smb2" => FsKind::Remote, "cifs" | "smb" | "smb2" | "smbfs" => FsKind::Remote,
// NFS variants
"nfs" | "nfs4" => FsKind::Remote,
// FUSE-based remote filesystems
"fuse.rclone" | "fuse.sshfs" | "fuse.davfs2" | "fuse.ceph"
| "fuse.glusterfs" | "fuse.s3fs" | "fuse.goofys" | "fuse.gcsfuse"
| "fuse.afp" | "fuse.afpfs" => FsKind::Remote,
// Other network protocols
"afs" | "coda" | "ncpfs" | "davfs" | "davfs2" | "shfs" => {
FsKind::Remote
}
// Cluster/distributed filesystems
"ceph" | "glusterfs" | "lustre" | "gfs" | "gfs2" | "ocfs2" => {
FsKind::Remote
}
// GVFS (GNOME Virtual File System)
"fuse.gvfsd-fuse" => FsKind::Gvfs, "fuse.gvfsd-fuse" => FsKind::Gvfs,
// Everything else is local
_ => FsKind::Local, _ => FsKind::Local,
}; };
Some((dev, kind)) Some((dev, kind))
@ -622,7 +645,7 @@ fn display_name_for_file(path: &Path, name: &str, get_from_gvfs: bool, is_deskto
); );
} else if get_from_gvfs { } else if get_from_gvfs {
#[cfg(feature = "gvfs")] #[cfg(feature = "gvfs")]
return Item::display_name(glib::filename_display_name(path).as_str()) return Item::display_name(glib::filename_display_name(path).as_str());
} }
Item::display_name(name) Item::display_name(name)
} }