From 3d02337487bea99b181c84c76adc7884e5e67b94 Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Thu, 12 Sep 2024 10:37:33 +0200
Subject: [PATCH] Remainder of revert and address identifier differently
 (#1455)

* Remainder of revert and address identifier differently

* Update Identifier.cs
---
 .../Controller/AquaComputer/HighFlowNext.cs        |  2 +-
 .../Hardware/Controller/Nzxt/GridV3.cs             |  2 +-
 .../Hardware/Controller/Nzxt/KrakenV2.cs           |  2 +-
 .../Hardware/Controller/Nzxt/KrakenV3.cs           |  2 +-
 LibreHardwareMonitorLib/Hardware/Identifier.cs     | 14 +++++++-------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/HighFlowNext.cs b/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/HighFlowNext.cs
index 646f21e..8e0e389 100644
--- a/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/HighFlowNext.cs
+++ b/LibreHardwareMonitorLib/Hardware/Controller/AquaComputer/HighFlowNext.cs
@@ -20,7 +20,7 @@ internal sealed class HighFlowNext : Hardware
     private readonly Sensor[] _voltages = new Sensor[2];
     private readonly Sensor[] _alarms = new Sensor[4];
 
-    public HighFlowNext(HidDevice dev, ISettings settings) : base("high flow NEXT", new Identifier("aquacomputer", "hfn", dev.GetSerialNumber().Replace(" ", "")), settings)
+    public HighFlowNext(HidDevice dev, ISettings settings) : base("high flow NEXT", new Identifier(dev.DevicePath), settings)
     {
         if (dev.TryOpen(out _stream))
         {
diff --git a/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/GridV3.cs b/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/GridV3.cs
index 57f8215..5eceb0e 100644
--- a/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/GridV3.cs
+++ b/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/GridV3.cs
@@ -33,7 +33,7 @@ internal sealed class GridV3 : Hardware
     private readonly HidStream _stream;
     private readonly Sensor[] _voltages = new Sensor[FANS_COUNT];
 
-    public GridV3(HidDevice dev, ISettings settings) : base("NZXT GRID+ V3", new Identifier("nzxt", "gridv3", dev.GetSerialNumber().TrimStart('0')), settings)
+    public GridV3(HidDevice dev, ISettings settings) : base("NZXT GRID+ V3", new Identifier(dev.DevicePath), settings)
     {
         if (dev.TryOpen(out _stream))
         {
diff --git a/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/KrakenV2.cs b/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/KrakenV2.cs
index 66b091d..ed81da0 100644
--- a/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/KrakenV2.cs
+++ b/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/KrakenV2.cs
@@ -25,7 +25,7 @@ internal sealed class KrakenV2 : Hardware
 
     private DateTime _lastUpdate = DateTime.MinValue;
 
-    public KrakenV2(HidDevice dev, ISettings settings) : base("Nzxt Kraken X", new Identifier("nzxt", "krakenx", dev.GetSerialNumber().TrimStart('0')), settings)
+    public KrakenV2(HidDevice dev, ISettings settings) : base("Nzxt Kraken X", new Identifier(dev.DevicePath), settings)
     {
         _device = dev;
 
diff --git a/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/KrakenV3.cs b/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/KrakenV3.cs
index 4ebc9d1..d2b0293 100644
--- a/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/KrakenV3.cs
+++ b/LibreHardwareMonitorLib/Hardware/Controller/Nzxt/KrakenV3.cs
@@ -25,7 +25,7 @@ internal sealed class KrakenV3 : Hardware
     private volatile bool _controllingFans;
     private volatile bool _controllingPump;
 
-    public KrakenV3(HidDevice dev, ISettings settings) : base("Nzxt Kraken Z", new Identifier("nzxt", "krakenz", dev.GetSerialNumber().TrimStart('0')), settings)
+    public KrakenV3(HidDevice dev, ISettings settings) : base("Nzxt Kraken Z", new Identifier(dev.DevicePath), settings)
     {
         switch (dev.ProductID)
         {
diff --git a/LibreHardwareMonitorLib/Hardware/Identifier.cs b/LibreHardwareMonitorLib/Hardware/Identifier.cs
index 1d92945..9d0eaa5 100644
--- a/LibreHardwareMonitorLib/Hardware/Identifier.cs
+++ b/LibreHardwareMonitorLib/Hardware/Identifier.cs
@@ -5,7 +5,6 @@
 // All Rights Reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Text;
 
 namespace LibreHardwareMonitor.Hardware;
@@ -20,7 +19,7 @@ public class Identifier : IComparable<Identifier>
 
     public Identifier(params string[] identifiers)
     {
-        CheckIdentifiers(identifiers);
+        CoerceIdentifiers(identifiers);
         StringBuilder s = new();
         for (int i = 0; i < identifiers.Length; i++)
         {
@@ -38,7 +37,7 @@ public class Identifier : IComparable<Identifier>
     /// <param name="extensions">Additional parts by which the base <see cref="Identifier" /> will be extended.</param>
     public Identifier(Identifier identifier, params string[] extensions)
     {
-        CheckIdentifiers(extensions);
+        CoerceIdentifiers(extensions);
         StringBuilder s = new();
         s.Append(identifier);
         for (int i = 0; i < extensions.Length; i++)
@@ -61,12 +60,13 @@ public class Identifier : IComparable<Identifier>
                               StringComparison.Ordinal);
     }
 
-    private static void CheckIdentifiers(IEnumerable<string> identifiers)
+    private static void CoerceIdentifiers(string[] identifiers)
     {
-        foreach (string s in identifiers)
+        for (int i = 0; i < identifiers.Length; i++)
         {
-            if (s.Contains(" ") || s.Contains(Separator.ToString()))
-                throw new ArgumentException("Invalid identifier");
+            string s = identifiers[i];
+            if (s.IndexOf(' ') >= 0)
+                identifiers[i] = s.Replace(' ', '-');
         }
     }