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

fix testcase fails on Windows

Browse source
This commit is contained in:
Nguyen Duc Toan 2023-09-30 13:41:54 +07:00
parent 102c30061e
commit b0d18e86fc
1 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
shared/src/fs.rs
View file

@ -1,7 +1,14 @@
use std::{collections::VecDeque, path::{Path, PathBuf}}; use std::{
collections::VecDeque,
path::{Path, PathBuf},
};
use anyhow::Result; use anyhow::Result;
use tokio::{fs, io, select, sync::{mpsc, oneshot}, time}; use tokio::{
fs, io, select,
sync::{mpsc, oneshot},
time,
};
pub async fn calculate_size(path: &Path) -> u64 { pub async fn calculate_size(path: &Path) -> u64 {
let mut total = 0; let mut total = 0;
@ -95,7 +102,10 @@ pub fn copy_with_progress(from: &Path, to: &Path) -> mpsc::Receiver<Result<u64,
#[cfg(not(target_os = "windows"))] #[cfg(not(target_os = "windows"))]
#[allow(clippy::collapsible_else_if)] #[allow(clippy::collapsible_else_if)]
pub fn file_mode(mode: u32) -> String { pub fn file_mode(mode: u32) -> String {
use libc::{S_IFBLK, S_IFCHR, S_IFDIR, S_IFIFO, S_IFLNK, S_IFMT, S_IFSOCK, S_IRGRP, S_IROTH, S_IRUSR, S_ISGID, S_ISUID, S_ISVTX, S_IWGRP, S_IWOTH, S_IWUSR, S_IXGRP, S_IXOTH, S_IXUSR}; use libc::{
S_IFBLK, S_IFCHR, S_IFDIR, S_IFIFO, S_IFLNK, S_IFMT, S_IFSOCK, S_IRGRP, S_IROTH, S_IRUSR,
S_ISGID, S_ISUID, S_ISVTX, S_IWGRP, S_IWOTH, S_IWUSR, S_IXGRP, S_IXOTH, S_IXUSR,
};
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let m = mode as u16; let m = mode as u16;
@ -123,27 +133,51 @@ pub fn file_mode(mode: u32) -> String {
s.push(if m & S_IRUSR != 0 { 'r' } else { '-' }); s.push(if m & S_IRUSR != 0 { 'r' } else { '-' });
s.push(if m & S_IWUSR != 0 { 'w' } else { '-' }); s.push(if m & S_IWUSR != 0 { 'w' } else { '-' });
s.push(if m & S_IXUSR != 0 { s.push(if m & S_IXUSR != 0 {
if m & S_ISUID != 0 { 's' } else { 'x' } if m & S_ISUID != 0 {
's'
} else { } else {
if m & S_ISUID != 0 { 'S' } else { '-' } 'x'
}
} else {
if m & S_ISUID != 0 {
'S'
} else {
'-'
}
}); });
// Group // Group
s.push(if m & S_IRGRP != 0 { 'r' } else { '-' }); s.push(if m & S_IRGRP != 0 { 'r' } else { '-' });
s.push(if m & S_IWGRP != 0 { 'w' } else { '-' }); s.push(if m & S_IWGRP != 0 { 'w' } else { '-' });
s.push(if m & S_IXGRP != 0 { s.push(if m & S_IXGRP != 0 {
if m & S_ISGID != 0 { 's' } else { 'x' } if m & S_ISGID != 0 {
's'
} else { } else {
if m & S_ISGID != 0 { 'S' } else { '-' } 'x'
}
} else {
if m & S_ISGID != 0 {
'S'
} else {
'-'
}
}); });
// Other // Other
s.push(if m & S_IROTH != 0 { 'r' } else { '-' }); s.push(if m & S_IROTH != 0 { 'r' } else { '-' });
s.push(if m & S_IWOTH != 0 { 'w' } else { '-' }); s.push(if m & S_IWOTH != 0 { 'w' } else { '-' });
s.push(if m & S_IXOTH != 0 { s.push(if m & S_IXOTH != 0 {
if m & S_ISVTX != 0 { 't' } else { 'x' } if m & S_ISVTX != 0 {
't'
} else { } else {
if m & S_ISVTX != 0 { 'T' } else { '-' } 'x'
}
} else {
if m & S_ISVTX != 0 {
'T'
} else {
'-'
}
}); });
s s
@ -172,6 +206,7 @@ pub fn max_common_root(files: &[impl AsRef<Path>]) -> PathBuf {
root root
} }
#[cfg(not(target_os = "windows"))]
#[test] #[test]
fn test_max_common_root() { fn test_max_common_root() {
assert_eq!(max_common_root(&[] as &[PathBuf]).as_os_str(), ""); assert_eq!(max_common_root(&[] as &[PathBuf]).as_os_str(), "");