CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-06-03 11:04:39 +12:00
Code Issues Projects Releases Wiki Activity

Added: Case insensitive process filtering

Browse source
This commit is contained in:
abrasumente 2022-05-01 01:08:27 +08:00
parent 0f117a0273
commit abc4fb25c3
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/btop_tools.hpp
View file

@ -187,6 +187,16 @@ namespace Tools {
return str.find(find_val) != string::npos; return str.find(find_val) != string::npos;
} }
//* Check if string <str> contains string <find_val>, while ignoring case
inline bool s_contains_ic(const string& str, const string& find_val) {
auto it = std::search(
str.begin(), str.end(),
find_val.begin(), find_val.end(),
[](char ch1, char ch2) { return std::toupper(ch1) == std::toupper(ch2); }
);
return it != str.end();
}
//* Return index of <find_val> from vector <vec>, returns size of <vec> if <find_val> is not present //* Return index of <find_val> from vector <vec>, returns size of <vec> if <find_val> is not present
template <typename T> template <typename T>
inline size_t v_index(const vector<T>& vec, const T& find_val) { inline size_t v_index(const vector<T>& vec, const T& find_val) {

2
src/freebsd/btop_collect.cpp
View file

@ -1317,7 +1317,7 @@ namespace Proc {
filter_found = 0; filter_found = 0;
for (auto &p : current_procs) { for (auto &p : current_procs) {
if (not tree and not filter.empty()) { if (not tree and not filter.empty()) {
if (not s_contains(to_string(p.pid), filter) and not s_contains(p.name, filter) and not s_contains(p.cmd, filter) and not s_contains(p.user, filter)) { if (not s_contains_ic(to_string(p.pid), filter) and not s_contains_ic(p.name, filter) and not s_contains_ic(p.cmd, filter) and not s_contains_ic(p.user, filter)) {
p.filtered = true; p.filtered = true;
filter_found++; filter_found++;
} else { } else {

8
src/linux/btop_collect.cpp
View file

@ -1700,10 +1700,10 @@ namespace Proc {
filter_found = 0; filter_found = 0;
for (auto& p : current_procs) { for (auto& p : current_procs) {
if (not tree and not filter.empty()) { if (not tree and not filter.empty()) {
if (not s_contains(to_string(p.pid), filter) if (not s_contains_ic(to_string(p.pid), filter)
and not s_contains(p.name, filter) and not s_contains_ic(p.name, filter)
and not s_contains(p.cmd, filter) and not s_contains_ic(p.cmd, filter)
and not s_contains(p.user, filter)) { and not s_contains_ic(p.user, filter)) {
p.filtered = true; p.filtered = true;
filter_found++; filter_found++;
} }

4
src/osx/btop_collect.cpp
View file

@ -1372,7 +1372,7 @@ namespace Proc {
filter_found = 0; filter_found = 0;
for (auto &p : current_procs) { for (auto &p : current_procs) {
if (not tree and not filter.empty()) { if (not tree and not filter.empty()) {
if (not s_contains(to_string(p.pid), filter) and not s_contains(p.name, filter) and not s_contains(p.cmd, filter) and not s_contains(p.user, filter)) { if (not s_contains_ic(to_string(p.pid), filter) and not s_contains_ic(p.name, filter) and not s_contains_ic(p.cmd, filter) and not s_contains_ic(p.user, filter)) {
p.filtered = true; p.filtered = true;
filter_found++; filter_found++;
} else { } else {
@ -1432,4 +1432,4 @@ namespace Tools {
} }
return 0.0; return 0.0;
} }
} // namespace Tools } // namespace Tools