Merge pull request #56 from sethworks/history

History
sethworks · Apr 3, 2024 · 74501f5 · 74501f5
2 parents d14c0c6 + 10a6525
commit 74501f5
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/functions/DiskSmartInfo.functions.internal.ps1 b/functions/DiskSmartInfo.functions.internal.ps1
@@ -114,7 +114,7 @@ function inGetDiskSmartInfo
                         $attribute.Add("Threshold", [byte]$thresholdsData[$a + 1])
                         $attribute.Add("Value", [byte]$smartData[$a + 3])
                         $attribute.Add("Worst", [byte]$smartData[$a + 4])
-                        $attribute.Add("Data", $(inGetAttributeData -smartData $smartData -a $a))
+                        $attribute.Add("Data", $(inGetAttributeData -smartAttributes $smartAttributes -smartData $smartData -a $a))
 
                         if ((-not $Quiet) -or (((isCritical -AttributeID $attributeID) -and $attribute.Data) -or (isThresholdReached -Attribute $attribute)))
                         {
@@ -123,7 +123,8 @@ function inGetDiskSmartInfo
                                 if ($hostHistoricalData)
                                 {
                                     $historicalAttributeData = $historicalAttributes.Where{$_.ID -eq $attributeID}.Data
-                                    if ($Config.ShowUnchangedDataHistory -or ($historicalAttributeData -ne $attribute.Data))
+                                    if ($Config.ShowUnchangedDataHistory -or
+                                       -not (inCompareAttributeData -attributeData $attribute.Data -historicalAttributeData $historicalAttributeData))
                                     {
                                         $attribute.Add("DataHistory", $historicalAttributeData)
                                     }
@@ -249,6 +250,7 @@ function inOverwriteAttributes
 function inGetAttributeData
 {
     Param(
+        $smartAttributes,
         $smartData,
         $a
     )
@@ -372,6 +374,8 @@ function inUpdateHistoricalData
 
         $attributes = @()
 
+        $smartAttributes = inOverwriteAttributes -model $model
+
         for ($a = $initialOffset; $a -lt $smartData.Count; $a += $attributeLength)
         {
             $attribute = [ordered]@{}
@@ -381,7 +385,7 @@ function inUpdateHistoricalData
             if ($attributeID)
             {
                 $attribute.Add("ID", $attributeID)
-                $attribute.Add("Data", $(inGetAttributeData -smartData $smartData -a $a))
+                $attribute.Add("Data", $(inGetAttributeData -smartAttributes $smartAttributes -smartData $smartData -a $a))
 
                 $attributes += [PSCustomObject]$attribute
             }

diff --git a/functions/DiskSmartInfo.functions.utility.ps1 b/functions/DiskSmartInfo.functions.utility.ps1
@@ -100,3 +100,31 @@ function inComposeHistoricalDataFileName
 
     return $fullname
 }
+
+function inCompareAttributeData
+{
+    Param (
+        $attributeData,
+        $historicalAttributeData
+    )
+
+    if ($attributeData.Count -eq $historicalAttributeData.Count)
+    {
+        if ($attributeData.Count -eq 1)
+        {
+            return $attributeData -eq $historicalAttributeData
+        }
+        elseif ($attributeData.Count -gt 1)
+        {
+            for ($i = 0; $i -lt $attributeData.Count; $i++)
+            {
+                if ($attributeData[$i] -ne $historicalAttributeData[$i])
+                {
+                    return $false
+                }
+            }
+            return $true
+        }
+    }
+    return $false
+}
diff --git a/tests/DiskSmartInfo.history.tests.ps1 b/tests/DiskSmartInfo.history.tests.ps1
@@ -324,6 +324,8 @@ Describe "History" {
             }
 
             It "Unchanged attribute data" {
+                $diskSmartInfo[0].SmartData[13].DataHistory | Should -BeNullOrEmpty
+                $diskSmartInfo[0].SmartData[13].Data | Should -Be @(39,14,47)
                 $diskSmartInfo[0].SmartData[20].DataHistory | Should -BeNullOrEmpty
                 $diskSmartInfo[0].SmartData[20].Data | Should -Be 702
             }