Merge pull request #1033 from yarrick/cpu_name

Update Ryzen name trimming
aristocratos · Feb 8, 2025 · 1a9d4ac · 1a9d4ac
2 parents fcd8e56 + 0705bd3
commit 1a9d4ac
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/btop_shared.cpp b/src/btop_shared.cpp
@@ -39,7 +39,14 @@ namespace Cpu {
 				name.clear();
 		} else if (v_contains(name_vec, "Ryzen"s)) {
 			auto ryz_pos = v_index(name_vec, "Ryzen"s);
-			name = "Ryzen" + (ryz_pos < name_vec.size() - 1 ? ' ' + name_vec.at(ryz_pos + 1) : "") + (ryz_pos < name_vec.size() - 2 ? ' ' + name_vec.at(ryz_pos + 2) : "");
+			name = "Ryzen";
+			int tokens = 0;
+			for (auto i = ryz_pos + 1; i < name_vec.size() && tokens < 2; i++) {
+				string p = name_vec.at(i);
+				if (p != "AI" && p != "PRO")
+					tokens++;
+				name += " " + p;
+			}
 		} else if (s_contains(name, "Intel"s) and v_contains(name_vec, "CPU"s)) {
 			auto cpu_pos = v_index(name_vec, "CPU"s);
 			if (cpu_pos < name_vec.size() - 1 and not name_vec.at(cpu_pos + 1).ends_with(')') and name_vec.at(cpu_pos + 1) != "@")