TheLanc3/QDiskInfo
1
0
Fork 0
mirror of https://github.com/edisionnano/QDiskInfo.git synced 2026-04-10 01:11:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Display SCSI Model Name correctly

Browse Source
This commit is contained in:
Spiros
2024-08-03 03:08:17 +03:00
parent 0d3f4a1979
commit 4b44d3815c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mainwindow.cpp
View File

@@ -181,7 +181,15 @@ void MainWindow::updateUI()
QJsonDocument localDoc = QJsonDocument::fromJson(allOutput.toUtf8()); QJsonDocument localDoc = QJsonDocument::fromJson(allOutput.toUtf8());
QJsonObject localObj = localDoc.object(); QJsonObject localObj = localDoc.object();
QString protocol = localObj["device"].toObject()["protocol"].toString();
bool isNvme = (protocol == "NVMe");
QString modelName = localObj["model_name"].toString(); QString modelName = localObj["model_name"].toString();
if (protocol == "SCSI") {
modelName = localObj["scsi_model_name"].toString();
}
QJsonArray attributes = localObj["ata_smart_attributes"].toObject()["table"].toArray(); QJsonArray attributes = localObj["ata_smart_attributes"].toObject()["table"].toArray();
QString temperature = "-- °C"; QString temperature = "-- °C";
bool healthPassed = localObj["smart_status"].toObject()["passed"].toBool(); bool healthPassed = localObj["smart_status"].toObject()["passed"].toBool();
@@ -202,9 +210,6 @@ void MainWindow::updateUI()
diskCapacityString = QString::number(diskCapacityGbInt/1000) + " " + tbSymbol; diskCapacityString = QString::number(diskCapacityGbInt/1000) + " " + tbSymbol;
} }
QString protocol = localObj["device"].toObject()["protocol"].toString();
bool isNvme = (protocol == "NVMe");
int temperatureInt = localObj["temperature"].toObject()["current"].toInt(); int temperatureInt = localObj["temperature"].toObject()["current"].toInt();
if (temperatureInt > 0) { if (temperatureInt > 0) {
if (ui->actionUse_Fahrenheit->isChecked()) { if (ui->actionUse_Fahrenheit->isChecked()) {
@@ -355,7 +360,12 @@ void MainWindow::populateWindow(const QJsonObject &localObj, const QString &heal
QString percentage = ""; QString percentage = "";
QString serialNumber = localObj["serial_number"].toString(); QString serialNumber = localObj["serial_number"].toString();
QJsonObject deviceObj = localObj["device"].toObject(); QJsonObject deviceObj = localObj["device"].toObject();
QString protocol = deviceObj["protocol"].toString(); QString protocol = deviceObj["protocol"].toString();
if (protocol == "SCSI") {
modelName = localObj["scsi_model_name"].toString();
}
QString type = deviceObj["type"].toString(); QString type = deviceObj["type"].toString();
QString name = deviceObj["name"].toString(); QString name = deviceObj["name"].toString();
QJsonArray outputArray = localObj.value("smartctl").toObject()["output"].toArray(); QJsonArray outputArray = localObj.value("smartctl").toObject()["output"].toArray();