mirror of
https://github.com/ClementTsang/bottom.git
synced 2024-09-11 03:35:35 +03:00
refactor: fix macro formatting in disk data collection code (#1363)
This commit is contained in:
parent
a1168cac67
commit
c10779ecc0
@ -341,20 +341,25 @@ impl DataCollection {
|
||||
|
||||
for (itx, device) in disks.iter().enumerate() {
|
||||
let checked_name = {
|
||||
cfg_if::cfg_if! {
|
||||
if #[cfg(target_os = "windows")] {
|
||||
#[cfg(target_os = "windows")]
|
||||
{
|
||||
match &device.volume_name {
|
||||
Some(volume_name) => Some(volume_name.as_str()),
|
||||
None => device.name.split('/').last(),
|
||||
}
|
||||
} else {
|
||||
}
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
{
|
||||
#[cfg(feature = "zfs")]
|
||||
if ! device.name.starts_with('/'){
|
||||
{
|
||||
if !device.name.starts_with('/') {
|
||||
Some(device.name.as_str()) // use the whole zfs dataset name
|
||||
} else {
|
||||
device.name.split('/').last()
|
||||
}
|
||||
}
|
||||
#[cfg(not(feature = "zfs"))]
|
||||
{
|
||||
device.name.split('/').last()
|
||||
}
|
||||
}
|
||||
@ -362,21 +367,25 @@ impl DataCollection {
|
||||
|
||||
if let Some(checked_name) = checked_name {
|
||||
let io_device = {
|
||||
cfg_if::cfg_if! {
|
||||
if #[cfg(target_os = "macos")] {
|
||||
use std::sync::OnceLock;
|
||||
#[cfg(target_os = "macos")]
|
||||
{
|
||||
use regex::Regex;
|
||||
use std::sync::OnceLock;
|
||||
|
||||
// Must trim one level further for macOS!
|
||||
static DISK_REGEX: OnceLock<Regex> = OnceLock::new();
|
||||
if let Some(new_name) = DISK_REGEX.get_or_init(|| Regex::new(r"disk\d+").unwrap()).find(checked_name) {
|
||||
if let Some(new_name) = DISK_REGEX
|
||||
.get_or_init(|| Regex::new(r"disk\d+").unwrap())
|
||||
.find(checked_name)
|
||||
{
|
||||
io.get(new_name.as_str())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
} else {
|
||||
io.get(checked_name)
|
||||
}
|
||||
#[cfg(not(target_os = "macos"))]
|
||||
{
|
||||
io.get(checked_name)
|
||||
}
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user