diff --git a/schema/nightly/bottom.json b/schema/nightly/bottom.json index b5c528242..efe6ce71f 100644 --- a/schema/nightly/bottom.json +++ b/schema/nightly/bottom.json @@ -677,29 +677,28 @@ "type": "string", "enum": [ "CPU%", - "Mem%", - "PID", + "Command", "Count", + "GMem", + "GMem%", + "GPU%", + "Mem", + "Mem%", "Name", - "Command", + "PID", "R/s", "Read", "Rps", - "W/s", - "Write", - "Wps", + "State", "T.Read", - "TWrite", "T.Write", "TRead", - "State", - "User", + "TWrite", "Time", - "GMem", - "GMem%", - "GMem", - "GMem%", - "GPU%" + "User", + "W/s", + "Wps", + "Write" ] }, "ProcessesConfig": { diff --git a/src/main.rs b/src/main.rs index b7d12bee2..26a89ffbe 100644 --- a/src/main.rs +++ b/src/main.rs @@ -286,6 +286,7 @@ fn generate_schema() -> anyhow::Result<()> { *enums = widgets::ProcColumn::VARIANTS .iter() .flat_map(|var| var.get_schema_names()) + .sorted() .map(|v| serde_json::Value::String(v.to_string())) .dedup() .collect(); diff --git a/src/widgets/process_table.rs b/src/widgets/process_table.rs index 6f86c65bd..6e620eaa1 100644 --- a/src/widgets/process_table.rs +++ b/src/widgets/process_table.rs @@ -76,8 +76,8 @@ fn make_column(column: ProcColumn) -> SortColumn<ProcColumn> { match column { CpuPercent => SortColumn::new(CpuPercent).default_descending(), - MemoryValue => SortColumn::new(MemoryValue).default_descending(), - MemoryPercent => SortColumn::new(MemoryPercent).default_descending(), + MemValue => SortColumn::new(MemValue).default_descending(), + MemPercent => SortColumn::new(MemPercent).default_descending(), Pid => SortColumn::new(Pid), Count => SortColumn::new(Count), Name => SortColumn::soft(Name, Some(0.3)), @@ -90,9 +90,9 @@ fn make_column(column: ProcColumn) -> SortColumn<ProcColumn> { State => SortColumn::hard(State, 9), Time => SortColumn::new(Time), #[cfg(feature = "gpu")] - GpuMemoryValue => SortColumn::new(GpuMemoryValue).default_descending(), + GpuMemValue => SortColumn::new(GpuMemValue).default_descending(), #[cfg(feature = "gpu")] - GpuMemoryPercent => SortColumn::new(GpuMemoryPercent).default_descending(), + GpuMemPercent => SortColumn::new(GpuMemPercent).default_descending(), #[cfg(feature = "gpu")] GpuUtilPercent => SortColumn::new(GpuUtilPercent).default_descending(), } @@ -248,9 +248,9 @@ impl ProcWidgetState { ProcWidgetColumn::Cpu => CpuPercent, ProcWidgetColumn::Mem => { if mem_as_values { - MemoryValue + MemValue } else { - MemoryPercent + MemPercent } } ProcWidgetColumn::ReadPerSecond => ReadPerSecond, @@ -263,9 +263,9 @@ impl ProcWidgetState { #[cfg(feature = "gpu")] ProcWidgetColumn::GpuMem => { if mem_as_values { - GpuMemoryValue + GpuMemValue } else { - GpuMemoryPercent + GpuMemPercent } } #[cfg(feature = "gpu")] @@ -280,11 +280,7 @@ impl ProcWidgetState { if is_count { Count } else { Pid }, if is_command { Command } else { Name }, CpuPercent, - if mem_as_values { - MemoryValue - } else { - MemoryPercent - }, + if mem_as_values { MemValue } else { MemPercent }, ReadPerSecond, WritePerSecond, TotalRead, @@ -306,7 +302,7 @@ impl ProcWidgetState { match col.inner() { CpuPercent => ProcWidgetColumn::Cpu, - MemoryValue | MemoryPercent => ProcWidgetColumn::Mem, + MemValue | MemPercent => ProcWidgetColumn::Mem, Pid | Count => ProcWidgetColumn::PidOrCount, Name | Command => ProcWidgetColumn::ProcNameOrCommand, ReadPerSecond => ProcWidgetColumn::ReadPerSecond, @@ -317,7 +313,7 @@ impl ProcWidgetState { User => ProcWidgetColumn::User, Time => ProcWidgetColumn::Time, #[cfg(feature = "gpu")] - GpuMemoryValue | GpuMemoryPercent => ProcWidgetColumn::GpuMem, + GpuMemValue | GpuMemPercent => ProcWidgetColumn::GpuMem, #[cfg(feature = "gpu")] GpuUtilPercent => ProcWidgetColumn::GpuUtil, } @@ -382,7 +378,7 @@ impl ProcWidgetState { self.column_mapping .get_index_of(&ProcWidgetColumn::Mem) .and_then(|index| self.table.columns.get(index)) - .map(|col| matches!(col.inner(), ProcColumn::MemoryPercent)) + .map(|col| matches!(col.inner(), ProcColumn::MemPercent)) .unwrap_or(false) } @@ -742,11 +738,11 @@ impl ProcWidgetState { if let Some(index) = self.column_mapping.get_index_of(&ProcWidgetColumn::Mem) { if let Some(mem) = self.get_mut_proc_col(index) { match mem { - ProcColumn::MemoryValue => { - *mem = ProcColumn::MemoryPercent; + ProcColumn::MemValue => { + *mem = ProcColumn::MemPercent; } - ProcColumn::MemoryPercent => { - *mem = ProcColumn::MemoryValue; + ProcColumn::MemPercent => { + *mem = ProcColumn::MemValue; } _ => unreachable!(), } @@ -759,11 +755,11 @@ impl ProcWidgetState { if let Some(index) = self.column_mapping.get_index_of(&ProcWidgetColumn::GpuMem) { if let Some(mem) = self.get_mut_proc_col(index) { match mem { - ProcColumn::GpuMemoryValue => { - *mem = ProcColumn::GpuMemoryPercent; + ProcColumn::GpuMemValue => { + *mem = ProcColumn::GpuMemPercent; } - ProcColumn::GpuMemoryPercent => { - *mem = ProcColumn::GpuMemoryValue; + ProcColumn::GpuMemPercent => { + *mem = ProcColumn::GpuMemValue; } _ => unreachable!(), } @@ -1110,7 +1106,7 @@ mod test { ); data.sort_by_key(|p| p.pid); - sort_skip_pid_asc(&ProcColumn::MemoryPercent, &mut data, SortOrder::Descending); + sort_skip_pid_asc(&ProcColumn::MemPercent, &mut data, SortOrder::Descending); assert_eq!( [&b, &a, &c, &d].iter().map(|d| (d.pid)).collect::<Vec<_>>(), data.iter().map(|d| (d.pid)).collect::<Vec<_>>(), @@ -1118,7 +1114,7 @@ mod test { // Note that the PID ordering for ties is still ascending. data.sort_by_key(|p| p.pid); - sort_skip_pid_asc(&ProcColumn::MemoryPercent, &mut data, SortOrder::Ascending); + sort_skip_pid_asc(&ProcColumn::MemPercent, &mut data, SortOrder::Ascending); assert_eq!( [&c, &d, &a, &b].iter().map(|d| (d.pid)).collect::<Vec<_>>(), data.iter().map(|d| (d.pid)).collect::<Vec<_>>(), @@ -1168,7 +1164,7 @@ mod test { let columns = vec![ ProcColumn::Pid, ProcColumn::Name, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::State, ]; let state = init_default_state(&init_columns); @@ -1186,14 +1182,10 @@ mod test { let original_columns = vec![ ProcColumn::Pid, ProcColumn::Name, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::State, ]; - let new_columns = vec![ - ProcColumn::Count, - ProcColumn::Name, - ProcColumn::MemoryPercent, - ]; + let new_columns = vec![ProcColumn::Count, ProcColumn::Name, ProcColumn::MemPercent]; let mut state = init_default_state(&init_columns); assert_eq!(get_columns(&state.table), original_columns); @@ -1218,16 +1210,12 @@ mod test { ]; let original_columns = vec![ ProcColumn::Name, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::User, ProcColumn::State, ProcColumn::Pid, ]; - let new_columns = vec![ - ProcColumn::Name, - ProcColumn::MemoryPercent, - ProcColumn::Count, - ]; + let new_columns = vec![ProcColumn::Name, ProcColumn::MemPercent, ProcColumn::Count]; let mut state = init_default_state(&init_columns); assert_eq!(get_columns(&state.table), original_columns); @@ -1252,13 +1240,13 @@ mod test { let original_columns = vec![ ProcColumn::Pid, ProcColumn::State, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::Command, ]; let new_columns = vec![ ProcColumn::Pid, ProcColumn::State, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::Name, ]; @@ -1286,13 +1274,13 @@ mod test { ]; let original_columns = vec![ ProcColumn::Pid, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::State, ProcColumn::Name, ]; let new_columns = vec![ ProcColumn::Pid, - ProcColumn::MemoryValue, + ProcColumn::MemValue, ProcColumn::State, ProcColumn::Name, ]; @@ -1317,13 +1305,13 @@ mod test { ]; let original_columns = vec![ ProcColumn::Pid, - ProcColumn::MemoryValue, + ProcColumn::MemValue, ProcColumn::State, ProcColumn::Name, ]; let new_columns = vec![ ProcColumn::Pid, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::State, ProcColumn::Name, ]; @@ -1352,7 +1340,7 @@ mod test { ]; let original_columns = vec![ ProcColumn::Pid, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::State, ProcColumn::Command, ]; @@ -1382,7 +1370,7 @@ mod test { ]; let original_columns = vec![ ProcColumn::Pid, - ProcColumn::MemoryValue, + ProcColumn::MemValue, ProcColumn::State, ProcColumn::Name, ]; @@ -1417,13 +1405,13 @@ mod test { ProcWidgetColumn::Mem, ]; let original_columns = vec![ - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::Pid, ProcColumn::State, ProcColumn::Name, ]; let new_columns = vec![ - ProcColumn::MemoryValue, + ProcColumn::MemValue, ProcColumn::Pid, ProcColumn::State, ProcColumn::Name, @@ -1456,14 +1444,10 @@ mod test { let original_columns = vec![ ProcColumn::Name, ProcColumn::Pid, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ProcColumn::State, ]; - let new_columns = vec![ - ProcColumn::Name, - ProcColumn::Count, - ProcColumn::MemoryPercent, - ]; + let new_columns = vec![ProcColumn::Name, ProcColumn::Count, ProcColumn::MemPercent]; let mut state = init_default_state(&init_columns); assert_eq!(get_columns(&state.table), original_columns); @@ -1495,13 +1479,13 @@ mod test { ProcColumn::Command, ProcColumn::Pid, ProcColumn::State, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ]; let new_columns = vec![ ProcColumn::Name, ProcColumn::Pid, ProcColumn::State, - ProcColumn::MemoryPercent, + ProcColumn::MemPercent, ]; let table_config = ProcTableConfig { diff --git a/src/widgets/process_table/process_columns.rs b/src/widgets/process_table/process_columns.rs index 68277e3b6..55524b6eb 100644 --- a/src/widgets/process_table/process_columns.rs +++ b/src/widgets/process_table/process_columns.rs @@ -15,8 +15,8 @@ use crate::{ )] pub enum ProcColumn { CpuPercent, - MemoryValue, - MemoryPercent, + MemValue, + MemPercent, Pid, Count, Name, @@ -29,9 +29,9 @@ pub enum ProcColumn { User, Time, #[cfg(feature = "gpu")] - GpuMemoryValue, + GpuMemValue, #[cfg(feature = "gpu")] - GpuMemoryPercent, + GpuMemPercent, #[cfg(feature = "gpu")] GpuUtilPercent, } @@ -47,7 +47,7 @@ impl ProcColumn { ProcColumn::Command => &["Command"], ProcColumn::CpuPercent => &["CPU%"], // TODO: Change this - ProcColumn::MemoryValue | ProcColumn::MemoryPercent => &["Mem", "Mem%"], + ProcColumn::MemValue | ProcColumn::MemPercent => &["Mem", "Mem%"], ProcColumn::ReadPerSecond => &["R/s", "Read", "Rps"], ProcColumn::WritePerSecond => &["W/s", "Write", "Wps"], ProcColumn::TotalRead => &["T.Read", "TWrite"], @@ -57,7 +57,7 @@ impl ProcColumn { ProcColumn::Time => &["Time"], #[cfg(feature = "gpu")] // TODO: Change this - ProcColumn::GpuMemoryValue | ProcColumn::GpuMemoryPercent => &["GMem", "GMem%"], + ProcColumn::GpuMemValue | ProcColumn::GpuMemPercent => &["GMem", "GMem%"], #[cfg(feature = "gpu")] ProcColumn::GpuUtilPercent => &["GPU%"], } @@ -68,8 +68,8 @@ impl ColumnHeader for ProcColumn { fn text(&self) -> Cow<'static, str> { match self { ProcColumn::CpuPercent => "CPU%", - ProcColumn::MemoryValue => "Mem", - ProcColumn::MemoryPercent => "Mem%", + ProcColumn::MemValue => "Mem", + ProcColumn::MemPercent => "Mem%", ProcColumn::Pid => "PID", ProcColumn::Count => "Count", ProcColumn::Name => "Name", @@ -82,9 +82,9 @@ impl ColumnHeader for ProcColumn { ProcColumn::User => "User", ProcColumn::Time => "Time", #[cfg(feature = "gpu")] - ProcColumn::GpuMemoryValue => "GMem", + ProcColumn::GpuMemValue => "GMem", #[cfg(feature = "gpu")] - ProcColumn::GpuMemoryPercent => "GMem%", + ProcColumn::GpuMemPercent => "GMem%", #[cfg(feature = "gpu")] ProcColumn::GpuUtilPercent => "GPU%", } @@ -94,8 +94,8 @@ impl ColumnHeader for ProcColumn { fn header(&self) -> Cow<'static, str> { match self { ProcColumn::CpuPercent => "CPU%(c)", - ProcColumn::MemoryValue => "Mem(m)", - ProcColumn::MemoryPercent => "Mem%(m)", + ProcColumn::MemValue => "Mem(m)", + ProcColumn::MemPercent => "Mem%(m)", ProcColumn::Pid => "PID(p)", ProcColumn::Count => "Count", ProcColumn::Name => "Name(n)", @@ -108,9 +108,9 @@ impl ColumnHeader for ProcColumn { ProcColumn::User => "User", ProcColumn::Time => "Time", #[cfg(feature = "gpu")] - ProcColumn::GpuMemoryValue => "GMem", + ProcColumn::GpuMemValue => "GMem", #[cfg(feature = "gpu")] - ProcColumn::GpuMemoryPercent => "GMem%", + ProcColumn::GpuMemPercent => "GMem%", #[cfg(feature = "gpu")] ProcColumn::GpuUtilPercent => "GPU%", } @@ -128,7 +128,7 @@ impl SortsRow for ProcColumn { sort_partial_fn(descending)(a.cpu_usage_percent, b.cpu_usage_percent) }); } - ProcColumn::MemoryValue | ProcColumn::MemoryPercent => { + ProcColumn::MemValue | ProcColumn::MemPercent => { data.sort_by(|a, b| sort_partial_fn(descending)(&a.mem_usage, &b.mem_usage)); } ProcColumn::Pid => { @@ -174,7 +174,7 @@ impl SortsRow for ProcColumn { data.sort_by(|a, b| sort_partial_fn(descending)(a.time, b.time)); } #[cfg(feature = "gpu")] - ProcColumn::GpuMemoryValue | ProcColumn::GpuMemoryPercent => { + ProcColumn::GpuMemValue | ProcColumn::GpuMemPercent => { data.sort_by(|a, b| { sort_partial_fn(descending)(&a.gpu_mem_usage, &b.gpu_mem_usage) }); @@ -196,7 +196,7 @@ impl<'de> Deserialize<'de> for ProcColumn { match value.as_str() { "cpu%" => Ok(ProcColumn::CpuPercent), // TODO: Maybe change this in the future. - "mem" | "mem%" => Ok(ProcColumn::MemoryPercent), + "mem" | "mem%" => Ok(ProcColumn::MemPercent), "pid" => Ok(ProcColumn::Pid), "count" => Ok(ProcColumn::Count), "name" => Ok(ProcColumn::Name), @@ -210,7 +210,7 @@ impl<'de> Deserialize<'de> for ProcColumn { "time" => Ok(ProcColumn::Time), #[cfg(feature = "gpu")] // TODO: Maybe change this in the future. - "gmem" | "gmem%" => Ok(ProcColumn::GpuMemoryPercent), + "gmem" | "gmem%" => Ok(ProcColumn::GpuMemPercent), #[cfg(feature = "gpu")] "gpu%" => Ok(ProcColumn::GpuUtilPercent), _ => Err(serde::de::Error::custom("doesn't match any column type")), @@ -224,7 +224,7 @@ impl From<&ProcColumn> for ProcWidgetColumn { ProcColumn::Pid | ProcColumn::Count => ProcWidgetColumn::PidOrCount, ProcColumn::Name | ProcColumn::Command => ProcWidgetColumn::ProcNameOrCommand, ProcColumn::CpuPercent => ProcWidgetColumn::Cpu, - ProcColumn::MemoryPercent | ProcColumn::MemoryValue => ProcWidgetColumn::Mem, + ProcColumn::MemPercent | ProcColumn::MemValue => ProcWidgetColumn::Mem, ProcColumn::ReadPerSecond => ProcWidgetColumn::ReadPerSecond, ProcColumn::WritePerSecond => ProcWidgetColumn::WritePerSecond, ProcColumn::TotalRead => ProcWidgetColumn::TotalRead, @@ -233,7 +233,7 @@ impl From<&ProcColumn> for ProcWidgetColumn { ProcColumn::User => ProcWidgetColumn::User, ProcColumn::Time => ProcWidgetColumn::Time, #[cfg(feature = "gpu")] - ProcColumn::GpuMemoryPercent | ProcColumn::GpuMemoryValue => ProcWidgetColumn::GpuMem, + ProcColumn::GpuMemPercent | ProcColumn::GpuMemValue => ProcWidgetColumn::GpuMem, #[cfg(feature = "gpu")] ProcColumn::GpuUtilPercent => ProcWidgetColumn::GpuUtil, } diff --git a/src/widgets/process_table/process_data.rs b/src/widgets/process_table/process_data.rs index 042f9873f..a0e774da2 100644 --- a/src/widgets/process_table/process_data.rs +++ b/src/widgets/process_table/process_data.rs @@ -280,7 +280,7 @@ impl ProcWidgetData { fn to_string(&self, column: &ProcColumn) -> String { match column { ProcColumn::CpuPercent => format!("{:.1}%", self.cpu_usage_percent), - ProcColumn::MemoryValue | ProcColumn::MemoryPercent => self.mem_usage.to_string(), + ProcColumn::MemValue | ProcColumn::MemPercent => self.mem_usage.to_string(), ProcColumn::Pid => self.pid.to_string(), ProcColumn::Count => self.num_similar.to_string(), ProcColumn::Name | ProcColumn::Command => self.id.to_prefixed_string(), @@ -292,9 +292,7 @@ impl ProcWidgetData { ProcColumn::User => self.user.clone(), ProcColumn::Time => format_time(self.time), #[cfg(feature = "gpu")] - ProcColumn::GpuMemoryValue | ProcColumn::GpuMemoryPercent => { - self.gpu_mem_usage.to_string() - } + ProcColumn::GpuMemValue | ProcColumn::GpuMemPercent => self.gpu_mem_usage.to_string(), #[cfg(feature = "gpu")] ProcColumn::GpuUtilPercent => format!("{:.1}%", self.gpu_usage), } @@ -312,9 +310,7 @@ impl DataToCell<ProcColumn> for ProcWidgetData { // differences. Some(match column { ProcColumn::CpuPercent => format!("{:.1}%", self.cpu_usage_percent).into(), - ProcColumn::MemoryValue | ProcColumn::MemoryPercent => { - self.mem_usage.to_string().into() - } + ProcColumn::MemValue | ProcColumn::MemPercent => self.mem_usage.to_string().into(), ProcColumn::Pid => self.pid.to_string().into(), ProcColumn::Count => self.num_similar.to_string().into(), ProcColumn::Name | ProcColumn::Command => self.id.to_prefixed_string().into(), @@ -332,7 +328,7 @@ impl DataToCell<ProcColumn> for ProcWidgetData { ProcColumn::User => self.user.clone().into(), ProcColumn::Time => format_time(self.time).into(), #[cfg(feature = "gpu")] - ProcColumn::GpuMemoryValue | ProcColumn::GpuMemoryPercent => { + ProcColumn::GpuMemValue | ProcColumn::GpuMemPercent => { self.gpu_mem_usage.to_string().into() } #[cfg(feature = "gpu")]