style fixes

include/hwinfo/disk.h

@@ -3,33 +3,32 @@
 
 #pragma once
 
+#include <hwinfo/platform.h>
+
 #include <cstdint>
 #include <string>
 #include <vector>
 
 namespace hwinfo {
 
-const unsigned short block_size = 512; // Linux always considers sectors to be 512 bytes long independently of the devices real block size.
+const unsigned short block_size =
+    512;  // Linux always considers sectors to be 512 bytes long independently of the devices real block size.
 
 class Disk {
   friend std::vector<Disk> getAllDisks();
 
  public:
   ~Disk() = default;
 
-  const std::string& vendor() const;
-  const std::string& model() const;
-  const std::string& serialNumber() const;
-  int64_t size_Bytes() const;
-  int id() const;
-  bool empty() const;
+  HWI_NODISCARD const std::string& vendor() const;
+  HWI_NODISCARD const std::string& model() const;
+  HWI_NODISCARD const std::string& serialNumber() const;
+  HWI_NODISCARD int64_t size_Bytes() const;
+  HWI_NODISCARD int id() const;
 
  private:
-  Disk() {
-    _vendor = "<unknown>";
-    _model = "<unknown>";
-    _serialNumber = "<unknown>";
-  }
+  Disk() = default;
+
   std::string _vendor;
   std::string _model;
   std::string _serialNumber;
@@ -38,10 +37,5 @@ class Disk {
 };
 
 std::vector<Disk> getAllDisks();
-std::string getDiskVendor(const std::string& path);
-std::string getDiskModel(const std::string& path);
-std::string getDiskSerialNumber(const std::string& path);
-int64_t getDiskSize_Bytes(const std::string& path);
-bool isPartition(const std::string& path);
 
 }  // namespace hwinfo

include/hwinfo/utils/filesystem.h

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "hwinfo/cpu.h"
+#include <hwinfo/cpu.h>
 
 namespace hwinfo {
 namespace filesystem {

src/disk.cpp

@@ -20,8 +20,4 @@ int64_t Disk::size_Bytes() const { return _size_Bytes; }
 // _____________________________________________________________________________________________________________________
 int Disk::id() const { return _id; }
 
-// _____________________________________________________________________________________________________________________
-bool Disk::empty() const { return (_vendor == "<unknown>" && _model == "<unknown>" && _serialNumber == "<unknown>" &&
-                                   _size_Bytes == -1 && _id == -1); }
-
 }  // namespace hwinfo

src/linux/disk.cpp

@@ -1,37 +1,38 @@
 // Copyright Leon Freist
 // Author Leon Freist <freist@informatik.uni-freiburg.de>
 
-#include "hwinfo/platform.h"
+#include <hwinfo/platform.h>
 
 #ifdef HWINFO_UNIX
 
+#include <hwinfo/disk.h>
+#include <hwinfo/utils/filesystem.h>
+#include <hwinfo/utils/stringutils.h>
+
 #include <fstream>
 #include <regex>
 
-#include "hwinfo/disk.h"
-#include "hwinfo/utils/filesystem.h"
-#include "hwinfo/utils/stringutils.h"
-
 namespace hwinfo {
 
 // _____________________________________________________________________________________________________________________
 bool isPartition(const std::string& path) {
-    std::regex partitionRegex(R"((sda|sdb|sdc|nvme\d+n\d+)p?\d+$)");
-    return std::regex_search(path, partitionRegex);
+  std::regex partitionRegex(R"((sd[a-z]|nvme\d+n\d+)p?\d+$)");
+  return std::regex_search(path, partitionRegex);
 }
 
 // _____________________________________________________________________________________________________________________
 std::string getDiskVendor(const std::string& path) {
   // nvme devices are in /sys/class/nvme/ and /sys/class/block/nvme*
   // but the vendor file is only in /sys/class/nvme/
   // so we need to check if the device is in /sys/class/block/nvme* and if so, we need to change the path
+  // TODO: use utils::get_specs_by_file
   std::string vendor_path = path;
   std::string::size_type nvme_pos = path.find("nvme");
   if (nvme_pos != std::string::npos) {
-    std::string nvme_name = path.substr(nvme_pos, 5); // Exemple : "nvme0"
+    std::string nvme_name = path.substr(nvme_pos, 5);  // Exemple : "nvme0"
     vendor_path = path.substr(0, nvme_pos - 6) + "nvme/" + nvme_name;
   }
-  
+
   std::ifstream f(vendor_path + "/device/vendor");
   if (f.is_open()) {
     std::string vendor;
@@ -40,7 +41,7 @@ std::string getDiskVendor(const std::string& path) {
     f.close();
     return vendor;
   }
-  
+
   return "<unknown>";
 }
 
@@ -89,16 +90,18 @@ std::vector<Disk> getAllDisks() {
   const std::string base_path("/sys/class/block/");
   for (const auto& entry : filesystem::getDirectoryEntries(base_path)) {
     std::string path(base_path + entry);
-    if (!filesystem::exists(path))
-      continue;
-    if (isPartition(path)) // Check if it's a partition
+    if (!filesystem::exists(path)) continue;
+    if (isPartition(path)) {  // Check if it's a partition
       continue;
+    }
     Disk disk = Disk();
     disk._vendor = getDiskVendor(path);
     disk._model = getDiskModel(path);
     disk._serialNumber = getDiskSerialNumber(path);
-    if (disk.empty()) // Check before get size because size is always define in /sys/class/block/...
+    // Check before get size because size is always define in /sys/class/block/...
+    if (disk._vendor == "<unknown>" && disk._model == "<unknown>" && disk._serialNumber == "<unknown>") {
       continue;
+    }
     disk._size_Bytes = getDiskSize_Bytes(path);
 
     disks.push_back(std::move(disk));