Export current and worst value of smart info

MicaApps · Mar 25, 2023 · 3e3027e · 3e3027e
1 parent a5e6777
commit 3e3027e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/DiskInfo/DiskInfoLib.Test/main.cpp b/DiskInfo/DiskInfoLib.Test/main.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include <iostream>
 #include <span>
 #include <fstream>
@@ -25,7 +25,12 @@ int main()
 	for (auto const& obj : info1.Attributes())
 	{
 		auto attr = obj.as<winrt::DiskInfoLibWinRT::SmartAttribute>();
-		std::wcout << attr.Id.data() << "\t" << attr.Name.data() << '\t' << attr.RawValue.data() << '\n';
+		std::wcout 
+			<< attr.Id.data() << "\t" 
+			<< attr.Name.data() << '\t' 
+			<< attr.RawValue.data() << '\t' 
+			<< attr.Current.data() <<'\t' 
+			<< attr.Worst.data() << '\n';
 	}
 
 	auto tData1 = info1.TemperatureData();

diff --git a/DiskInfo/DiskInfoLib/AtaSmartInfo.cpp b/DiskInfo/DiskInfoLib/AtaSmartInfo.cpp
@@ -328,6 +328,8 @@ namespace winrt::DiskInfoLibWinRT::implementation
 
             attr.RawValue = rawValue;
             attr.Threshold = std::format(L"{:0>2X}", threshold.ThresholdValue);
+            attr.Current = std::to_wstring(static_cast<int>(original.Attribute[j].CurrentValue)).data();
+            attr.Worst = std::to_wstring(static_cast<int>(original.Attribute[j].WorstValue)).data();
 
             Attributes().Append(winrt::box_value(attr));
         }

diff --git a/DiskInfo/DiskInfoLib/AtaSmartInfo.idl b/DiskInfo/DiskInfoLib/AtaSmartInfo.idl
@@ -13,11 +13,12 @@ namespace DiskInfoLibWinRT
     //对应SMART_ATTRIBUTE
     struct SmartAttribute
     {
-
         String Id;
         String Name;
         String RawValue;
         String Threshold;
+        String Current;
+        String Worst;
     };