Skip to content

Commit 02b947d

Browse files
ClementTsangClementTsang
authored
refactor: quick variable/struct/file rename (#1620)
Some renames and file movement. No functional changes.
1 parent ae14685 commit 02b947d

File tree

7 files changed

+56
-50
lines changed

7 files changed

+56
-50
lines changed

‎src/app.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pub mod filter;
33
pub mod frozen_state;
44
pub mod layout_manager;
55
mod process_killer;
6-
pub mod query;
76
pub mod states;
87

98
use std::{
@@ -28,7 +27,7 @@ use crate::{
2827
data_conversion::ConvertedData,
2928
get_network_points,
3029
utils::data_units::DataUnit,
31-
widgets::{ProcWidgetColumn, ProcWidgetMode},
30+
widgets::{query::ProcessQuery, ProcWidgetColumn, ProcWidgetMode},
3231
};
3332

3433
#[derive(Debug, Clone, Eq, PartialEq, Default)]
@@ -671,7 +670,7 @@ impl App {
671670
}
672671
}
673672

674-
pub fn get_process_filter(&self, widget_id: u64) -> &Option<query::Query> {
673+
pub fn get_process_filter(&self, widget_id: u64) -> &Option<ProcessQuery> {
675674
if let Some(process_widget_state) = self.states.proc_state.widget_states.get(&widget_id) {
676675
&process_widget_state.proc_search.search_state.query
677676
} else {

‎src/app/states.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ use unicode_ellipsis::grapheme_width;
66
use unicode_segmentation::{GraphemeCursor, GraphemeIncomplete, UnicodeSegmentation};
77

88
use crate::{
9-
app::{layout_manager::BottomWidgetType, query::*},
9+
app::layout_manager::BottomWidgetType,
1010
constants,
1111
widgets::{
12-
BatteryWidgetState, CpuWidgetState, DiskTableWidget, MemWidgetState, NetWidgetState,
13-
ProcWidgetState, TempWidgetState,
12+
query::ProcessQuery, BatteryWidgetState, CpuWidgetState, DiskTableWidget, MemWidgetState,
13+
NetWidgetState, ProcWidgetState, TempWidgetState,
1414
},
1515
};
1616

@@ -90,7 +90,7 @@ pub struct AppSearchState {
9090
pub size_mappings: IndexMap<usize, Range<usize>>,
9191

9292
/// The query. TODO: Merge this as one enum.
93-
pub query: Option<Query>,
93+
pub query: Option<ProcessQuery>,
9494
pub error_message: Option<String>,
9595
}
9696

‎src/options.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ pub(crate) fn init_app(
519519
))
520520
}
521521

522-
pub fn get_widget_layout(
522+
fn get_widget_layout(
523523
args: &BottomArgs, config: &Config,
524524
) -> OptionResult<(BottomLayout, u64, Option<BottomWidgetType>)> {
525525
let cpu_left_legend = is_flag_enabled!(cpu_left_legend, args.cpu, config);

‎src/widgets/process_table.rs‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pub mod proc_widget_column;
22
pub mod proc_widget_data;
3+
pub mod query;
34
mod sort_table;
45

56
use std::{borrow::Cow, collections::BTreeMap};
@@ -9,12 +10,12 @@ use indexmap::IndexSet;
910
use itertools::Itertools;
1011
pub use proc_widget_column::*;
1112
pub use proc_widget_data::*;
13+
use query::{parse_query, ProcessQuery};
1214
use sort_table::SortTableColumn;
1315

1416
use crate::{
1517
app::{
1618
data_farmer::{DataCollection, ProcessData},
17-
query::*,
1819
AppConfigFields, AppSearchState,
1920
},
2021
canvas::components::data_table::{
@@ -75,7 +76,7 @@ fn make_column(column: ProcColumn) -> SortColumn<ProcColumn> {
7576

7677
match column {
7778
CpuPercent => SortColumn::new(CpuPercent).default_descending(),
78-
MemoryVal => SortColumn::new(MemoryVal).default_descending(),
79+
MemoryValue => SortColumn::new(MemoryValue).default_descending(),
7980
MemoryPercent => SortColumn::new(MemoryPercent).default_descending(),
8081
Pid => SortColumn::new(Pid),
8182
Count => SortColumn::new(Count),
@@ -89,9 +90,9 @@ fn make_column(column: ProcColumn) -> SortColumn<ProcColumn> {
8990
State => SortColumn::hard(State, 9),
9091
Time => SortColumn::new(Time),
9192
#[cfg(feature = "gpu")]
92-
GpuMem => SortColumn::new(GpuMem).default_descending(),
93+
GpuMemoryValue => SortColumn::new(GpuMemoryValue).default_descending(),
9394
#[cfg(feature = "gpu")]
94-
GpuMemPercent => SortColumn::new(GpuMemPercent).default_descending(),
95+
GpuMemoryPercent => SortColumn::new(GpuMemoryPercent).default_descending(),
9596
#[cfg(feature = "gpu")]
9697
GpuUtilPercent => SortColumn::new(GpuUtilPercent).default_descending(),
9798
}
@@ -247,7 +248,7 @@ impl ProcWidgetState {
247248
ProcWidgetColumn::Cpu => CpuPercent,
248249
ProcWidgetColumn::Mem => {
249250
if mem_as_values {
250-
MemoryVal
251+
MemoryValue
251252
} else {
252253
MemoryPercent
253254
}
@@ -262,9 +263,9 @@ impl ProcWidgetState {
262263
#[cfg(feature = "gpu")]
263264
ProcWidgetColumn::GpuMem => {
264265
if mem_as_values {
265-
GpuMem
266+
GpuMemoryValue
266267
} else {
267-
GpuMemPercent
268+
GpuMemoryPercent
268269
}
269270
}
270271
#[cfg(feature = "gpu")]
@@ -280,7 +281,7 @@ impl ProcWidgetState {
280281
if is_command { Command } else { Name },
281282
CpuPercent,
282283
if mem_as_values {
283-
MemoryVal
284+
MemoryValue
284285
} else {
285286
MemoryPercent
286287
},
@@ -305,7 +306,7 @@ impl ProcWidgetState {
305306

306307
match col.inner() {
307308
CpuPercent => ProcWidgetColumn::Cpu,
308-
MemoryVal | MemoryPercent => ProcWidgetColumn::Mem,
309+
MemoryValue | MemoryPercent => ProcWidgetColumn::Mem,
309310
Pid | Count => ProcWidgetColumn::PidOrCount,
310311
Name | Command => ProcWidgetColumn::ProcNameOrCommand,
311312
ReadPerSecond => ProcWidgetColumn::ReadPerSecond,
@@ -316,7 +317,7 @@ impl ProcWidgetState {
316317
User => ProcWidgetColumn::User,
317318
Time => ProcWidgetColumn::Time,
318319
#[cfg(feature = "gpu")]
319-
GpuMem | GpuMemPercent => ProcWidgetColumn::GpuMem,
320+
GpuMemoryValue | GpuMemoryPercent => ProcWidgetColumn::GpuMem,
320321
#[cfg(feature = "gpu")]
321322
GpuUtilPercent => ProcWidgetColumn::GpuUtil,
322323
}
@@ -385,7 +386,7 @@ impl ProcWidgetState {
385386
.unwrap_or(false)
386387
}
387388

388-
fn get_query(&self) -> &Option<Query> {
389+
fn get_query(&self) -> &Option<ProcessQuery> {
389390
if self.proc_search.search_state.is_invalid_or_blank_search() {
390391
&None
391392
} else {
@@ -741,11 +742,11 @@ impl ProcWidgetState {
741742
if let Some(index) = self.column_mapping.get_index_of(&ProcWidgetColumn::Mem) {
742743
if let Some(mem) = self.get_mut_proc_col(index) {
743744
match mem {
744-
ProcColumn::MemoryVal => {
745+
ProcColumn::MemoryValue => {
745746
*mem = ProcColumn::MemoryPercent;
746747
}
747748
ProcColumn::MemoryPercent => {
748-
*mem = ProcColumn::MemoryVal;
749+
*mem = ProcColumn::MemoryValue;
749750
}
750751
_ => unreachable!(),
751752
}
@@ -758,11 +759,11 @@ impl ProcWidgetState {
758759
if let Some(index) = self.column_mapping.get_index_of(&ProcWidgetColumn::GpuMem) {
759760
if let Some(mem) = self.get_mut_proc_col(index) {
760761
match mem {
761-
ProcColumn::GpuMem => {
762-
*mem = ProcColumn::GpuMemPercent;
762+
ProcColumn::GpuMemoryValue => {
763+
*mem = ProcColumn::GpuMemoryPercent;
763764
}
764-
ProcColumn::GpuMemPercent => {
765-
*mem = ProcColumn::GpuMem;
765+
ProcColumn::GpuMemoryPercent => {
766+
*mem = ProcColumn::GpuMemoryValue;
766767
}
767768
_ => unreachable!(),
768769
}
@@ -1291,7 +1292,7 @@ mod test {
12911292
];
12921293
let new_columns = vec![
12931294
ProcColumn::Pid,
1294-
ProcColumn::MemoryVal,
1295+
ProcColumn::MemoryValue,
12951296
ProcColumn::State,
12961297
ProcColumn::Name,
12971298
];
@@ -1316,7 +1317,7 @@ mod test {
13161317
];
13171318
let original_columns = vec![
13181319
ProcColumn::Pid,
1319-
ProcColumn::MemoryVal,
1320+
ProcColumn::MemoryValue,
13201321
ProcColumn::State,
13211322
ProcColumn::Name,
13221323
];
@@ -1381,7 +1382,7 @@ mod test {
13811382
];
13821383
let original_columns = vec![
13831384
ProcColumn::Pid,
1384-
ProcColumn::MemoryVal,
1385+
ProcColumn::MemoryValue,
13851386
ProcColumn::State,
13861387
ProcColumn::Name,
13871388
];
@@ -1422,7 +1423,7 @@ mod test {
14221423
ProcColumn::Name,
14231424
];
14241425
let new_columns = vec![
1425-
ProcColumn::MemoryVal,
1426+
ProcColumn::MemoryValue,
14261427
ProcColumn::Pid,
14271428
ProcColumn::State,
14281429
ProcColumn::Name,

‎src/widgets/process_table/proc_widget_column.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
#[derive(Debug, PartialEq, Eq, Copy, Clone, Hash)]
1010
pub enum ProcColumn {
1111
CpuPercent,
12-
MemoryVal,
12+
MemoryValue,
1313
MemoryPercent,
1414
Pid,
1515
Count,
@@ -23,9 +23,9 @@ pub enum ProcColumn {
2323
User,
2424
Time,
2525
#[cfg(feature = "gpu")]
26-
GpuMem,
26+
GpuMemoryValue,
2727
#[cfg(feature = "gpu")]
28-
GpuMemPercent,
28+
GpuMemoryPercent,
2929
#[cfg(feature = "gpu")]
3030
GpuUtilPercent,
3131
}
@@ -34,7 +34,7 @@ impl ColumnHeader for ProcColumn {
3434
fn text(&self) -> Cow<'static, str> {
3535
match self {
3636
ProcColumn::CpuPercent => "CPU%",
37-
ProcColumn::MemoryVal => "Mem",
37+
ProcColumn::MemoryValue => "Mem",
3838
ProcColumn::MemoryPercent => "Mem%",
3939
ProcColumn::Pid => "PID",
4040
ProcColumn::Count => "Count",
@@ -48,9 +48,9 @@ impl ColumnHeader for ProcColumn {
4848
ProcColumn::User => "User",
4949
ProcColumn::Time => "Time",
5050
#[cfg(feature = "gpu")]
51-
ProcColumn::GpuMem => "GMem",
51+
ProcColumn::GpuMemoryValue => "GMem",
5252
#[cfg(feature = "gpu")]
53-
ProcColumn::GpuMemPercent => "GMem%",
53+
ProcColumn::GpuMemoryPercent => "GMem%",
5454
#[cfg(feature = "gpu")]
5555
ProcColumn::GpuUtilPercent => "GPU%",
5656
}
@@ -60,7 +60,7 @@ impl ColumnHeader for ProcColumn {
6060
fn header(&self) -> Cow<'static, str> {
6161
match self {
6262
ProcColumn::CpuPercent => "CPU%(c)",
63-
ProcColumn::MemoryVal => "Mem(m)",
63+
ProcColumn::MemoryValue => "Mem(m)",
6464
ProcColumn::MemoryPercent => "Mem%(m)",
6565
ProcColumn::Pid => "PID(p)",
6666
ProcColumn::Count => "Count",
@@ -74,9 +74,9 @@ impl ColumnHeader for ProcColumn {
7474
ProcColumn::User => "User",
7575
ProcColumn::Time => "Time",
7676
#[cfg(feature = "gpu")]
77-
ProcColumn::GpuMem => "GMem",
77+
ProcColumn::GpuMemoryValue => "GMem",
7878
#[cfg(feature = "gpu")]
79-
ProcColumn::GpuMemPercent => "GMem%",
79+
ProcColumn::GpuMemoryPercent => "GMem%",
8080
#[cfg(feature = "gpu")]
8181
ProcColumn::GpuUtilPercent => "GPU%",
8282
}
@@ -94,7 +94,7 @@ impl SortsRow for ProcColumn {
9494
sort_partial_fn(descending)(a.cpu_usage_percent, b.cpu_usage_percent)
9595
});
9696
}
97-
ProcColumn::MemoryVal | ProcColumn::MemoryPercent => {
97+
ProcColumn::MemoryValue | ProcColumn::MemoryPercent => {
9898
data.sort_by(|a, b| sort_partial_fn(descending)(&a.mem_usage, &b.mem_usage));
9999
}
100100
ProcColumn::Pid => {
@@ -140,7 +140,7 @@ impl SortsRow for ProcColumn {
140140
data.sort_by(|a, b| sort_partial_fn(descending)(a.time, b.time));
141141
}
142142
#[cfg(feature = "gpu")]
143-
ProcColumn::GpuMem | ProcColumn::GpuMemPercent => {
143+
ProcColumn::GpuMemoryValue | ProcColumn::GpuMemoryPercent => {
144144
data.sort_by(|a, b| {
145145
sort_partial_fn(descending)(&a.gpu_mem_usage, &b.gpu_mem_usage)
146146
});

‎src/widgets/process_table/proc_widget_data.rs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ impl ProcWidgetData {
280280
fn to_string(&self, column: &ProcColumn) -> String {
281281
match column {
282282
ProcColumn::CpuPercent => format!("{:.1}%", self.cpu_usage_percent),
283-
ProcColumn::MemoryVal | ProcColumn::MemoryPercent => self.mem_usage.to_string(),
283+
ProcColumn::MemoryValue | ProcColumn::MemoryPercent => self.mem_usage.to_string(),
284284
ProcColumn::Pid => self.pid.to_string(),
285285
ProcColumn::Count => self.num_similar.to_string(),
286286
ProcColumn::Name | ProcColumn::Command => self.id.to_prefixed_string(),
@@ -292,7 +292,9 @@ impl ProcWidgetData {
292292
ProcColumn::User => self.user.clone(),
293293
ProcColumn::Time => format_time(self.time),
294294
#[cfg(feature = "gpu")]
295-
ProcColumn::GpuMem | ProcColumn::GpuMemPercent => self.gpu_mem_usage.to_string(),
295+
ProcColumn::GpuMemoryValue | ProcColumn::GpuMemoryPercent => {
296+
self.gpu_mem_usage.to_string()
297+
}
296298
#[cfg(feature = "gpu")]
297299
ProcColumn::GpuUtilPercent => format!("{:.1}%", self.gpu_usage),
298300
}
@@ -310,7 +312,9 @@ impl DataToCell<ProcColumn> for ProcWidgetData {
310312
// differences.
311313
Some(match column {
312314
ProcColumn::CpuPercent => format!("{:.1}%", self.cpu_usage_percent).into(),
313-
ProcColumn::MemoryVal | ProcColumn::MemoryPercent => self.mem_usage.to_string().into(),
315+
ProcColumn::MemoryValue | ProcColumn::MemoryPercent => {
316+
self.mem_usage.to_string().into()
317+
}
314318
ProcColumn::Pid => self.pid.to_string().into(),
315319
ProcColumn::Count => self.num_similar.to_string().into(),
316320
ProcColumn::Name | ProcColumn::Command => self.id.to_prefixed_string().into(),
@@ -328,7 +332,9 @@ impl DataToCell<ProcColumn> for ProcWidgetData {
328332
ProcColumn::User => self.user.clone().into(),
329333
ProcColumn::Time => format_time(self.time).into(),
330334
#[cfg(feature = "gpu")]
331-
ProcColumn::GpuMem | ProcColumn::GpuMemPercent => self.gpu_mem_usage.to_string().into(),
335+
ProcColumn::GpuMemoryValue | ProcColumn::GpuMemoryPercent => {
336+
self.gpu_mem_usage.to_string().into()
337+
}
332338
#[cfg(feature = "gpu")]
333339
ProcColumn::GpuUtilPercent => format!("{:.1}%", self.gpu_usage).into(),
334340
})

‎src/app/query.rs‎ renamed to ‎src/widgets/process_table/query.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ const AND_LIST: [&str; 2] = ["and", "&&"];
7777
pub(crate) fn parse_query(
7878
search_query: &str, is_searching_whole_word: bool, is_ignoring_case: bool,
7979
is_searching_with_regex: bool,
80-
) -> QueryResult<Query> {
81-
fn process_string_to_filter(query: &mut VecDeque<String>) -> QueryResult<Query> {
80+
) -> QueryResult<ProcessQuery> {
81+
fn process_string_to_filter(query: &mut VecDeque<String>) -> QueryResult<ProcessQuery> {
8282
let lhs = process_or(query)?;
8383
let mut list_of_ors = vec![lhs];
8484

8585
while query.front().is_some() {
8686
list_of_ors.push(process_or(query)?);
8787
}
8888

89-
Ok(Query { query: list_of_ors })
89+
Ok(ProcessQuery { query: list_of_ors })
9090
}
9191

9292
fn process_or(query: &mut VecDeque<String>) -> QueryResult<Or> {
@@ -532,12 +532,12 @@ pub(crate) fn parse_query(
532532
Ok(process_filter)
533533
}
534534

535-
pub struct Query {
535+
pub struct ProcessQuery {
536536
/// Remember, AND > OR, but AND must come after OR when we parse.
537537
query: Vec<Or>,
538538
}
539539

540-
impl Query {
540+
impl ProcessQuery {
541541
fn process_regexes(
542542
&mut self, is_searching_whole_word: bool, is_ignoring_case: bool,
543543
is_searching_with_regex: bool,
@@ -560,7 +560,7 @@ impl Query {
560560
}
561561
}
562562

563-
impl Debug for Query {
563+
impl Debug for ProcessQuery {
564564
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
565565
f.write_fmt(format_args!("{:?}", self.query))
566566
}

0 commit comments

Comments
 (0)