mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: apply natural sort to partitions on both Linux and macOS (#2235)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2025-01-22 22:00:45 +08:00 • committed by sxyazi
parent 456935658a
commit abb43251fa
No known key found for this signature in database
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
yazi-fs/src/mounts/linux.rs
View file

@ -3,7 +3,7 @@ use std::{borrow::Cow, collections::{HashMap, HashSet}, ffi::{OsStr, OsString},
use anyhow::Result; use anyhow::Result;
use tokio::{io::{Interest, unix::AsyncFd}, time::sleep}; use tokio::{io::{Interest, unix::AsyncFd}, time::sleep};
use tracing::error; use tracing::error;
use yazi_shared::{replace_cow, replace_vec_cow}; use yazi_shared::{natsort, replace_cow, replace_vec_cow};
use super::{Locked, Partition, Partitions}; use super::{Locked, Partition, Partitions};
@ -77,6 +77,7 @@ impl Partitions {
let mut set: HashSet<&OsStr> = set.iter().map(AsRef::as_ref).collect(); let mut set: HashSet<&OsStr> = set.iter().map(AsRef::as_ref).collect();
mounts.iter().filter_map(|p| p.dev_name()).for_each(|s| _ = set.remove(s)); mounts.iter().filter_map(|p| p.dev_name()).for_each(|s| _ = set.remove(s));
mounts.extend(set.into_iter().map(Partition::new)); mounts.extend(set.into_iter().map(Partition::new));
mounts.sort_unstable_by(|a, b| natsort(a.src.as_bytes(), b.src.as_bytes(), false));
}; };
let labels = Self::labels()?; let labels = Self::labels()?;

3
yazi-fs/src/mounts/macos.rs
View file

@ -7,6 +7,7 @@ use objc::{msg_send, runtime::Object, sel, sel_impl};
use scopeguard::defer; use scopeguard::defer;
use tracing::error; use tracing::error;
use yazi_ffi::{CFDict, CFString, DADiskCopyDescription, DADiskCreateFromBSDName, DARegisterDiskAppearedCallback, DARegisterDiskDescriptionChangedCallback, DARegisterDiskDisappearedCallback, DASessionCreate, DASessionScheduleWithRunLoop, IOIteratorNext, IOObjectRelease, IORegistryEntryCreateCFProperty, IOServiceGetMatchingServices, IOServiceMatching}; use yazi_ffi::{CFDict, CFString, DADiskCopyDescription, DADiskCreateFromBSDName, DARegisterDiskAppearedCallback, DARegisterDiskDescriptionChangedCallback, DARegisterDiskDisappearedCallback, DASessionCreate, DASessionScheduleWithRunLoop, IOIteratorNext, IOObjectRelease, IORegistryEntryCreateCFProperty, IOServiceGetMatchingServices, IOServiceMatching};
use yazi_shared::natsort;
use super::{Locked, Partition, Partitions}; use super::{Locked, Partition, Partitions};
@ -145,7 +146,7 @@ impl Partitions {
} }
} }
names.sort_unstable(); names.sort_unstable_by(|a, b| natsort(a.as_bytes(), b.as_bytes(), false));
Ok(names) Ok(names)
} }

2
yazi-fs/src/mounts/partition.rs
View file

@ -22,7 +22,7 @@ impl Partition {
let b: &[u8] = self.fstype.as_ref().map_or(b"", |s| s.as_encoded_bytes()); let b: &[u8] = self.fstype.as_ref().map_or(b"", |s| s.as_encoded_bytes());
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
{ {
matches!(b, b"autofs" | b"binfmt_misc" | b"bpf" | b"cgroup2" | b"configfs" | b"debugfs" | b"devpts" | b"devtmpfs" | b"fuse.gvfsd-fuse" | b"fusectl" | b"hugetlbfs" | b"mqueue" | b"proc" | b"ramfs" | b"securityfs" | b"sysfs" | b"tmpfs") matches!(b, b"autofs" | b"binfmt_misc" | b"bpf" | b"cgroup2" | b"configfs" | b"debugfs" | b"devpts" | b"devtmpfs" | b"fuse.gvfsd-fuse" | b"fusectl" | b"hugetlbfs" | b"mqueue" | b"proc" | b"pstore" | b"ramfs" | b"securityfs" | b"sysfs" | b"tmpfs" | b"tracefs")
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {