diff --git a/src/utils/platform.rs b/src/utils/platform.rs index bcfee1d..bf876f1 100644 --- a/src/utils/platform.rs +++ b/src/utils/platform.rs @@ -1,22 +1,25 @@ use std; -#[cfg(not(target_os = "macos"))] +#[cfg(not(any(target_os = "macos", target_os = "linux")))] pub fn get_block_size() -> u64 { 1024 } -#[cfg(target_os = "macos")] +#[cfg(any(target_os = "macos", target_os = "linux"))] pub fn get_block_size() -> u64 { 512 } #[cfg(target_os = "linux")] -pub fn get_metadata(d: &std::fs::DirEntry, s: bool) -> Option<(u64, Option<(u64, u64)>)> { +pub fn get_metadata( + d: &std::fs::DirEntry, + use_apparent_size: bool, +) -> Option<(u64, Option<(u64, u64)>)> { use std::os::linux::fs::MetadataExt; match d.metadata().ok() { Some(md) => { let inode = Some((md.st_ino(), md.st_dev())); - if s { + if use_apparent_size { Some((md.len(), inode)) } else { Some((md.st_blocks() * get_block_size(), inode)) @@ -27,12 +30,15 @@ pub fn get_metadata(d: &std::fs::DirEntry, s: bool) -> Option<(u64, Option<(u64, } #[cfg(target_os = "unix")] -pub fn get_metadata(d: &std::fs::DirEntry, s: bool) -> Option<(u64, Option<(u64, u64)>)> { +pub fn get_metadata( + d: &std::fs::DirEntry, + use_apparent_size: bool, +) -> Option<(u64, Option<(u64, u64)>)> { use std::os::unix::fs::MetadataExt; match d.metadata().ok() { Some(md) => { let inode = Some((md.ino(), md.dev())); - if s { + if use_apparent_size { Some((md.len(), inode)) } else { Some((md.blocks() * get_block_size(), inode)) @@ -43,12 +49,15 @@ pub fn get_metadata(d: &std::fs::DirEntry, s: bool) -> Option<(u64, Option<(u64, } #[cfg(target_os = "macos")] -pub fn get_metadata(d: &std::fs::DirEntry, s: bool) -> Option<(u64, Option<(u64, u64)>)> { +pub fn get_metadata( + d: &std::fs::DirEntry, + use_apparent_size: bool, +) -> Option<(u64, Option<(u64, u64)>)> { use std::os::macos::fs::MetadataExt; match d.metadata().ok() { Some(md) => { let inode = Some((md.st_ino(), md.st_dev())); - if s { + if use_apparent_size { Some((md.len(), inode)) } else { Some((md.st_blocks() * get_block_size(), inode))