Board: split out from host; add support for Windows

src/detection/board/board.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_board_board
+#define FF_INCLUDED_detection_board_board
+
+#include "fastfetch.h"
+
+typedef struct FFBoardResult
+{
+    FFstrbuf boardName;
+    FFstrbuf boardVendor;
+    FFstrbuf boardVersion;
+    FFstrbuf error;
+} FFBoardResult;
+
+void ffDetectBoard(FFBoardResult* result);
+
+#endif

src/detection/board/board_android.c

@@ -0,0 +1,10 @@
+#include "board.h"
+
+void ffDetectBoard(FFBoardResult* board)
+{
+    ffStrbufInitS(&board->error, "Not supported on Android");
+
+    ffStrbufInit(&board->boardName);
+    ffStrbufInit(&board->boardVendor);
+    ffStrbufInit(&board->boardVersion);
+}

src/detection/board/board_apple.c

@@ -0,0 +1,10 @@
+#include "board.h"
+
+void ffDetectBoard(FFBoardResult* board)
+{
+    ffStrbufInitS(&board->error, "Not supported on macOS");
+
+    ffStrbufInit(&board->boardName);
+    ffStrbufInit(&board->boardVendor);
+    ffStrbufInit(&board->boardVersion);
+}

src/detection/board/board_linux.c

@@ -0,0 +1,55 @@
+#include "board.h"
+#include "common/io.h"
+
+#include <stdlib.h>
+
+static bool hostValueSet(FFstrbuf* value)
+{
+    return
+        value->length > 0 &&
+        ffStrbufStartsWithIgnCaseS(value, "To be filled") != true &&
+        ffStrbufStartsWithIgnCaseS(value, "To be set") != true &&
+        ffStrbufStartsWithIgnCaseS(value, "OEM") != true &&
+        ffStrbufStartsWithIgnCaseS(value, "O.E.M.") != true &&
+        ffStrbufIgnCaseCompS(value, "None") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Product") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Product Name") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Product Version") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Name") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Version") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Default string") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Undefined") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Not Specified") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Not Applicable") != 0 &&
+        ffStrbufIgnCaseCompS(value, "INVALID") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Type1ProductConfigId") != 0 &&
+        ffStrbufIgnCaseCompS(value, "All Series") != 0
+    ;
+}
+
+static void getHostValue(const char* devicesPath, const char* classPath, FFstrbuf* buffer)
+{
+    ffReadFileBuffer(devicesPath, buffer);
+    if(hostValueSet(buffer))
+        return;
+
+    ffReadFileBuffer(classPath, buffer);
+    if(hostValueSet(buffer))
+        return;
+
+    ffStrbufClear(buffer);
+}
+
+void ffDetectBoard(FFBoardResult* board)
+{
+    ffStrbufInit(&board->error);
+
+    ffStrbufInit(&board->boardName);
+    getHostValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->boardName);
+
+    ffStrbufInit(&board->boardVendor);
+    getHostValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &board->boardVendor);
+
+    ffStrbufInit(&board->boardVersion);
+    getHostValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &board->boardVersion);
+}

src/detection/board/board_windows.cpp

@@ -0,0 +1,36 @@
+extern "C" {
+#include "board.h"
+}
+#include "util/windows/wmi.hpp"
+
+extern "C" void ffDetectBoard(FFBoardResult* board)
+{
+    ffStrbufInit(&board->error);
+
+    ffStrbufInit(&board->boardName);
+    ffStrbufInit(&board->boardVendor);
+    ffStrbufInit(&board->boardVersion);
+
+    IEnumWbemClassObject* pEnumerator = ffQueryWmi(L"SELECT Product, Version, Manufacturer FROM Win32_BaseBoard", &board->error);
+    if(!pEnumerator)
+        return;
+
+    IWbemClassObject *pclsObj = NULL;
+    ULONG uReturn = 0;
+
+    pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn);
+
+    if(uReturn == 0)
+    {
+        ffStrbufInitS(&board->error, "No Wmi result returned");
+        pEnumerator->Release();
+        return;
+    }
+
+    ffGetWmiObjValue(pclsObj, L"Product", &board->boardName);
+    ffGetWmiObjValue(pclsObj, L"Manufacturer", &board->boardVendor);
+    ffGetWmiObjValue(pclsObj, L"Version", &board->boardVersion);
+
+    pclsObj->Release();
+    pEnumerator->Release();
+}

src/detection/host/host.h

@@ -14,9 +14,6 @@ typedef struct FFHostResult
     FFstrbuf productName;
     FFstrbuf productVersion;
     FFstrbuf productSku;
-    FFstrbuf boardName;
-    FFstrbuf boardVendor;
-    FFstrbuf boardVersion;
     FFstrbuf chassisType;
     FFstrbuf chassisVendor;
     FFstrbuf chassisVersion;

src/detection/host/host_android.c

@@ -34,9 +34,6 @@ void ffDetectHostImpl(FFHostResult* host)
 
     ffStrbufInitA(&host->productVersion, 0);
     ffStrbufInitA(&host->productSku, 0);
-    ffStrbufInitA(&host->boardName, 0);
-    ffStrbufInitA(&host->boardVendor, 0);
-    ffStrbufInitA(&host->boardVersion, 0);
     ffStrbufInitA(&host->chassisType, 0);
     ffStrbufInitA(&host->chassisVendor, 0);
     ffStrbufInitA(&host->chassisVersion, 0);

src/detection/host/host_apple.c

@@ -120,9 +120,6 @@ void ffDetectHostImpl(FFHostResult* host)
     ffStrbufInit(&host->productSku);
 
     ffStrbufInitA(&host->sysVendor, 0);
-    ffStrbufInitA(&host->boardName, 0);
-    ffStrbufInitA(&host->boardVendor, 0);
-    ffStrbufInitA(&host->boardVersion, 0);
     ffStrbufInitA(&host->chassisType, 0);
     ffStrbufInitA(&host->chassisVendor, 0);
     ffStrbufInitA(&host->chassisVersion, 0);

src/detection/host/host_linux.c

@@ -74,15 +74,6 @@ void ffDetectHostImpl(FFHostResult* host)
     ffStrbufInit(&host->productSku);
     getHostValue("/sys/devices/virtual/dmi/id/product_sku", "/sys/class/dmi/id/product_sku", &host->productSku);
 
-    ffStrbufInit(&host->boardName);
-    getHostValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &host->boardName);
-
-    ffStrbufInit(&host->boardVendor);
-    getHostValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &host->boardVendor);
-
-    ffStrbufInit(&host->boardVersion);
-    getHostValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &host->boardVersion);
-
     ffStrbufInit(&host->chassisType);
     getHostValue("/sys/devices/virtual/dmi/id/chassis_type", "/sys/class/dmi/id/chassis_type", &host->chassisType);
 

src/detection/host/host_windows.cpp

@@ -12,9 +12,6 @@ extern "C" void ffDetectHostImpl(FFHostResult* host)
     ffStrbufInit(&host->productVersion);
     ffStrbufInit(&host->productSku);
     ffStrbufInit(&host->sysVendor);
-    ffStrbufInit(&host->boardName);
-    ffStrbufInit(&host->boardVendor);
-    ffStrbufInit(&host->boardVersion);
     ffStrbufInit(&host->chassisType);
     ffStrbufInit(&host->chassisVendor);
     ffStrbufInit(&host->chassisVersion);