fix: simplify shell and improve hardware detection

Author: Sopwit

src/backend/nvidia/detector.cpp

@@ -14,6 +14,7 @@ NvidiaDetector::NvidiaDetector(QObject *parent) : QObject(parent) {}
 NvidiaDetector::GpuInfo NvidiaDetector::detect() const {
   GpuInfo info;
 
+  info.displayAdapterName = detectDisplayAdapterName();
   info.name = detectGpuName();
   info.found = !info.name.isEmpty();
   info.driverVersion = detectDriverVersion();
@@ -50,7 +51,11 @@ QString NvidiaDetector::activeDriver() const {
 }
 
 QString NvidiaDetector::verificationReport() const {
-  const QString gpuText = m_info.found ? m_info.name : tr("None");
+  const QString gpuText = m_info.found
+                              ? m_info.name
+                              : (m_info.displayAdapterName.isEmpty()
+                                     ? tr("None")
+                                     : m_info.displayAdapterName);
   const QString versionText =
       m_info.driverVersion.isEmpty() ? tr("None") : m_info.driverVersion;
 
@@ -70,6 +75,39 @@ void NvidiaDetector::refresh() {
   emit infoChanged();
 }
 
+QString NvidiaDetector::detectDisplayAdapterName() const {
+  if (!CapabilityProbe::isToolAvailable(QStringLiteral("lspci"))) {
+    return {};
+  }
+
+  CommandRunner runner;
+
+  const auto result =
+      runner.run(QStringLiteral("lspci"), {QStringLiteral("-mm")});
+
+  if (!result.success())
+    return {};
+
+  const QStringList lines = result.stdout.split(QLatin1Char('\n'));
+  for (const QString &line : lines) {
+    if (line.contains(QStringLiteral("VGA"), Qt::CaseInsensitive) ||
+        line.contains(QStringLiteral("3D controller"), Qt::CaseInsensitive) ||
+        line.contains(QStringLiteral("Display controller"),
+                      Qt::CaseInsensitive)) {
+      static const QRegularExpression re(QStringLiteral("\"([^\"]+)\""));
+      auto it = re.globalMatch(line);
+      QStringList parts;
+      while (it.hasNext())
+        parts << it.next().captured(1);
+
+      if (parts.size() >= 3)
+        return parts[2];
+    }
+  }
+
+  return {};
+}
+
 QString NvidiaDetector::detectGpuName() const {
   if (!CapabilityProbe::isToolAvailable(QStringLiteral("lspci"))) {
     return {};

src/backend/nvidia/detector.h

@@ -9,6 +9,8 @@ class NvidiaDetector : public QObject {
 
   Q_PROPERTY(bool gpuFound READ gpuFound NOTIFY infoChanged)
   Q_PROPERTY(QString gpuName READ gpuName NOTIFY infoChanged)
+  Q_PROPERTY(QString displayAdapterName READ displayAdapterName NOTIFY
+                 infoChanged)
   Q_PROPERTY(QString driverVersion READ driverVersion NOTIFY infoChanged)
   Q_PROPERTY(bool driverLoaded READ driverLoaded NOTIFY infoChanged)
   Q_PROPERTY(bool nouveauActive READ nouveauActive NOTIFY infoChanged)
@@ -24,6 +26,7 @@ class NvidiaDetector : public QObject {
   struct GpuInfo {
     bool found = false;
     QString name;
+    QString displayAdapterName;
     QString driverVersion;
     QString vbiosVersion;
     bool driverLoaded = false;
@@ -38,6 +41,7 @@ class NvidiaDetector : public QObject {
 
   bool gpuFound() const { return m_info.found; }
   QString gpuName() const { return m_info.name; }
+  QString displayAdapterName() const { return m_info.displayAdapterName; }
   QString driverVersion() const { return m_info.driverVersion; }
   bool driverLoaded() const { return m_info.driverLoaded; }
   bool nouveauActive() const { return m_info.nouveauActive; }
@@ -63,6 +67,7 @@ class NvidiaDetector : public QObject {
 
 private:
   QString detectGpuName() const;
+  QString detectDisplayAdapterName() const;
   QString detectDriverVersion() const;
   bool isPackageInstalled(const QString &packageName) const;
   bool isModuleLoaded(const QString &moduleName) const;