CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-15 09:54:33 +12:00
Code Issues Projects Releases Wiki Activity

simplify removal of "Apple"

Browse source
This commit is contained in:
masiboss 2023-12-07 21:42:11 +01:00
parent 5beb9e12e5
commit 5902484f39
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/osx/btop_collect.cpp
View file

@ -227,11 +227,6 @@ namespace Cpu {
name = name_vec.at(cpu_pos + 1);
else
name.clear();
} else if (v_contains(name_vec, "Apple"s)) {
auto apple_pos = v_index(name_vec, "Apple"s);
name = (apple_pos < name_vec.size() - 1 ? name_vec.at(apple_pos + 1) : "")
+ (apple_pos < name_vec.size() - 1 && name_vec.size() > 2 ? ' ' + name_vec.at(apple_pos + 2) : "")
+ (apple_pos < name_vec.size() - 1 && name_vec.size() > 3 ? ' ' + name_vec.at(apple_pos + 3) : "");
} else
name.clear();
@ -241,7 +236,7 @@ namespace Cpu {
name += n + ' ';
}
name.pop_back();
for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Core"}) {
for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Apple", "Core"}) {
name = s_replace(name, replace, "");
name = s_replace(name, " ", " ");
}