hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 07:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

debug: clean up opening of files in HyprCtl (#8401)

Browse source 
`std::ifstream` is more suited than `execAndGet` here.
This commit is contained in:
WavyEbuilder 2024-11-10 15:54:15 +00:00 committed by GitHub
parent 99b01c5d12
commit 9e628067fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/debug/HyprCtl.cpp
View file

@ -1,6 +1,7 @@
#include "HyprCtl.hpp" #include "HyprCtl.hpp"
#include <format> #include <format>
#include <fstream>
#include <netinet/in.h> #include <netinet/in.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -949,11 +950,27 @@ std::string systemInfoRequest(eHyprCtlOutputFormat format, std::string request)
const std::string GPUINFO = execAndGet("lspci -vnn | grep VGA"); const std::string GPUINFO = execAndGet("lspci -vnn | grep VGA");
#endif #endif
result += "GPU information: \n" + GPUINFO; result += "GPU information: \n" + GPUINFO;
if (GPUINFO.contains("NVIDIA") && std::filesystem::exists("/proc/driver/nvidia/version")) if (GPUINFO.contains("NVIDIA") && std::filesystem::exists("/proc/driver/nvidia/version")) {
result += execAndGet("cat /proc/driver/nvidia/version | grep NVRM"); std::ifstream file("/proc/driver/nvidia/version");
std::string line;
if (file.is_open()) {
while (std::getline(file, line)) {
if (!line.contains("NVRM"))
continue;
result += line;
result += "\n";
}
} else
result += "error";
}
result += "\n\n"; result += "\n\n";
result += "os-release: " + execAndGet("cat /etc/os-release") + "\n\n"; if (std::ifstream file("/etc/os-release"); file.is_open()) {
std::stringstream buffer;
buffer << file.rdbuf();
result += "os-release: " + buffer.str() + "\n\n";
} else
result += "os-release: error\n\n";
result += "plugins:\n"; result += "plugins:\n";
if (g_pPluginSystem) { if (g_pPluginSystem) {