Remove special characters from sensor and hardware name

Danil0v3s · Danil0v3s · commit 544188b96f20 · 2025-01-24T22:54:50.000Z
diff --git a/HardwareMonitor/HardwareMonitor/HardwareMonitor.csproj b/HardwareMonitor/HardwareMonitor/HardwareMonitor.csproj
@@ -6,6 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <ApplicationIcon>..\..\target\desktop\src\main\resources\imgs\favicon.ico</ApplicationIcon>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/HardwareMonitor/HardwareMonitor/Monitor/MonitorPoller.cs b/HardwareMonitor/HardwareMonitor/Monitor/MonitorPoller.cs
@@ -1,6 +1,8 @@
 ﻿#pragma warning disable CS8601 // Possible null
 
+using System.Globalization;
 using System.Text;
+using System.Text.RegularExpressions;
 using HardwareMonitor.PresentMon;
 using HardwareMonitor.SharedMemory;
 using HardwareMonitor.Sockets;
@@ -54,31 +56,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         using var writer = new BinaryWriter(memoryStream);
         var accumulator = 0;
 
-        writer.Write((short)MonitorPacketCommand.Data);
-        writer.Write(sharedMemoryData.Hardwares.Count);
-        writer.Write(sharedMemoryData.Sensors.Count);
-
-        foreach (var hardware in sharedMemoryData.Hardwares)
-        {
-            writer.Write(GetBytes(hardware.Name, SharedMemoryConsts.NameSize));
-            writer.Write(GetBytes(hardware.Identifier, SharedMemoryConsts.IdentifierSize));
-            writer.Write((int)hardware.HardwareType);
-        }
-
-        for (var index = 0; index < sharedMemoryData.Sensors.Count; index++)
-        {
-            var sensor = sharedMemoryData.Sensors[index];
-            sensor.Value = float.IsNaN(sensor.Sensor.Value ?? 0f) ? 0f : (sensor.Sensor.Value ?? 0f);
-
-            writer.Write(GetBytes(sensor.Name, SharedMemoryConsts.NameSize));
-            writer.Write(GetBytes(sensor.Identifier, SharedMemoryConsts.IdentifierSize));
-            writer.Write(GetBytes(sensor.HardwareIdentifier, SharedMemoryConsts.IdentifierSize));
-            writer.Write((int)sensor.SensorType);
-            writer.Write((float)sensor.Value);
-
-            // store the starting offset of the float we just wrote
-            sensorValueOffset[index] = (int)writer.BaseStream.Position - 4;
-        }
+        WriteDataToStream(writer, sharedMemoryData);
 
         while (!stoppingToken.IsCancellationRequested)
         {
@@ -88,21 +66,13 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 await Task.Delay(1000, stoppingToken);
                 continue;
             }
-            
+
             foreach (var hardware in sharedMemoryData.Hardwares)
             {
                 hardware.Hardware.Update();
             }
 
-            for (var index = 0; index < sharedMemoryData.Sensors.Count; index++)
-            {
-                var sensor = sharedMemoryData.Sensors[index];
-                sensor.Value = float.IsNaN(sensor.Sensor.Value ?? 0f) ? 0f : (sensor.Sensor.Value ?? 0f);
-
-                // seek to the sensor value offset
-                writer.Seek(sensorValueOffset[index], SeekOrigin.Begin);
-                writer.Write((float)sensor.Value);
-            }
+            WriteDataToStream(writer, sharedMemoryData);
 
             if (_socketHost.HasConnections())
             {
@@ -123,6 +93,39 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         hostApplicationLifetime.StopApplication();
     }
 
+    private static void WriteDataToStream(BinaryWriter writer, SharedMemoryData sharedMemoryData)
+    {
+        writer.Seek(0, SeekOrigin.Begin);
+        writer.Write((short)MonitorPacketCommand.Data);
+        writer.Write(sharedMemoryData.Hardwares.Count);
+        writer.Write(sharedMemoryData.Sensors.Count);
+
+        foreach (var hardware in sharedMemoryData.Hardwares)
+        {
+            writer.Write((short)hardware.Name.Length);
+            writer.Write((short)hardware.Identifier.Length);
+            writer.Write(Encoding.UTF8.GetBytes(hardware.Name));
+            writer.Write(Encoding.UTF8.GetBytes(hardware.Identifier));
+            writer.Write((int)hardware.HardwareType);
+        }
+
+        foreach (var sensor in sharedMemoryData.Sensors)
+        {
+            var value = sensor.HardwareSensor.Value ?? 0f;
+            var floatValue = (IsNaN(value) ? 0f : value).ToString(CultureInfo.InvariantCulture);
+            sensor.Value = float.Parse(floatValue, CultureInfo.InvariantCulture);
+
+            writer.Write((short)sensor.Name.Length);
+            writer.Write((short)sensor.Identifier.Length);
+            writer.Write((short)sensor.HardwareIdentifier.Length);
+            writer.Write(Encoding.UTF8.GetBytes(sensor.Name));
+            writer.Write(Encoding.UTF8.GetBytes(sensor.Identifier));
+            writer.Write(Encoding.UTF8.GetBytes(sensor.HardwareIdentifier));
+            writer.Write((int)sensor.SensorType);
+            writer.Write((float)sensor.Value);
+        }
+    }
+
     private void OnClientConnected()
     {
         SendPresentMonAppsToClients();
@@ -175,7 +178,6 @@ private void SendPresentMonAppsToClients()
         using var writer = new BinaryWriter(memoryStream);
 
         writer.Write((short)MonitorPacketCommand.PresentMonApps);
-        //logger.LogInformation("Sending presentmon apps to clients {Count}", _presentMonPoller.CurrentApps.Count);
         writer.Write((short)_presentMonPoller.CurrentApps.Count);
         foreach (var app in _presentMonPoller.CurrentApps)
         {
@@ -245,24 +247,35 @@ private void Stop()
 
     private static SharedMemoryHardware MapHardware(IHardware hardware) => new()
     {
-        Name = hardware.Name,
+        Name = RemoveSpecialCharacters(hardware.Name),
         Identifier = hardware.Identifier.ToString(),
         HardwareType = hardware.HardwareType,
         Hardware = hardware
     };
 
     private static SharedMemorySensor MapSensor(ISensor sensor) => new()
     {
-        Name = sensor.Name,
+        Name = RemoveSpecialCharacters(sensor.Name),
         Identifier = sensor.Identifier.ToString(),
         SensorType = sensor.SensorType,
         Value = float.IsNaN(sensor.Value ?? 0f) ? 0f : (sensor.Value ?? 0f),
         HardwareIdentifier = sensor.Hardware.Identifier.ToString(),
-        Sensor = sensor
+        HardwareSensor = sensor
     };
 
     private static byte[] GetBytes(string str, int length)
     {
         return Encoding.UTF8.GetBytes(str.Length > length ? str[..length] : str.PadRight(length, '\0'));
     }
+    
+    public static string RemoveSpecialCharacters(string str)
+    {
+        return Regex.Replace(str, "[^a-zA-Z0-9_ .]+", "_", RegexOptions.Compiled);
+    }
+
+    public static unsafe bool IsNaN(float f)
+    {
+        int binary = *(int*)(&f);
+        return ((binary & 0x7F800000) == 0x7F800000) && ((binary & 0x007FFFFF) != 0);
+    }
 }
diff --git a/HardwareMonitor/HardwareMonitor/SharedMemory/SharedMemory.cs b/HardwareMonitor/HardwareMonitor/SharedMemory/SharedMemory.cs
@@ -44,7 +44,7 @@ public bool ShouldSerializeHardware()
 
 public class SharedMemorySensor
 {
-    public required ISensor Sensor;
+    public required ISensor HardwareSensor;
     public required string Name { get; set; }
     public required string Identifier { get; set; }
     public required string HardwareIdentifier { get; set; }
diff --git a/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorReader.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorReader.kt
@@ -37,9 +37,12 @@ object HardwareMonitorReader {
                 is Packet.Data -> {
                     // read first 8 bytes to get the amount of hardware and sensors
                     val (hardware, sensor) = readHardwareAndSensorCount(packet.data)
-                    if (hardware + sensor <= 0) return@mapNotNull null
+                    if (hardware + sensor <= 0) {
+                        println("No hardware or sensor available, skipping")
+                        return@mapNotNull null
+                    }
 
-                    val buffer = getByteBuffer(packet.data, hardware * HARDWARE_SIZE + sensor * SENSOR_SIZE, HEADER_SIZE)
+                    val buffer = getByteBuffer(packet.data, packet.data.size - HEADER_SIZE, HEADER_SIZE)
                     val hardwares = readHardware(buffer, hardware)
                     val sensors = readSensor(buffer, sensor)
                     _currentData = _currentData.copy(Hardwares = hardwares, Sensors = sensors, LastPollTime = System.currentTimeMillis())
@@ -67,9 +70,11 @@ object HardwareMonitorReader {
     private fun readHardware(buffer: ByteBuffer, count: Int): List<HardwareMonitorData.Hardware> {
         return buildList {
             for (i in 0 until count) {
+                val nameSize = buffer.short.toInt()
+                val identifierSize = buffer.short.toInt()
                 val hardware = HardwareMonitorData.Hardware(
-                    Name = buffer.readString(NAME_SIZE),
-                    Identifier = buffer.readString(IDENTIFIER_SIZE),
+                    Name = buffer.readString(nameSize),
+                    Identifier = buffer.readString(identifierSize),
                     HardwareType = HardwareMonitorData.HardwareType.fromValue(buffer.int),
                 )
                 add(hardware)
@@ -80,10 +85,13 @@ object HardwareMonitorReader {
     private fun readSensor(buffer: ByteBuffer, count: Int): List<HardwareMonitorData.Sensor> {
         return buildList {
             for (i in 0 until count) {
+                val nameSize = buffer.short.toInt()
+                val identifierSize = buffer.short.toInt()
+                val hardwareIdentifier = buffer.short.toInt()
                 val sensor = HardwareMonitorData.Sensor(
-                    Name = buffer.readString(NAME_SIZE),
-                    Identifier = buffer.readString(IDENTIFIER_SIZE),
-                    HardwareIdentifier = buffer.readString(IDENTIFIER_SIZE),
+                    Name = buffer.readString(nameSize),
+                    Identifier = buffer.readString(identifierSize),
+                    HardwareIdentifier = buffer.readString(hardwareIdentifier),
                     SensorType = HardwareMonitorData.SensorType.fromValue(buffer.int),
                     Value = buffer.float,
                 )
diff --git a/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/SocketClient.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/SocketClient.kt
@@ -86,7 +86,6 @@ object SocketClient {
                 try {
                     val command = getCommand(inputStream)
                     val size = getSize(inputStream)
-                    println("Received $command with $size bytes")
                     when (command) {
                         Command.Data -> packetChannel.trySend(Packet.Data(inputStream.readNBytes(size)))
                         Command.PresentMonApps -> packetChannel.trySend(Packet.PresentMonApps(inputStream.readNBytes(size)))
diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/HelpSettingsUi.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/HelpSettingsUi.kt
@@ -1,5 +1,6 @@
 package app.cleanmeter.target.desktop.ui.settings.tabs
 
+import FilledButton
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.Orientation
@@ -48,6 +49,7 @@ import app.cleanmeter.target.desktop.ui.components.HotKeySymbol
 import app.cleanmeter.target.desktop.ui.components.section.CollapsibleSection
 import app.cleanmeter.target.desktop.ui.components.section.ToggleSection
 import app.cleanmeter.target.desktop.ui.settings.SettingsEvent
+import java.io.File
 
 @Composable
 internal fun HelpSettingsUi(
@@ -133,6 +135,10 @@ internal fun HelpSettingsUi(
             isEnabled = overlaySettings.isLoggingEnabled,
             onSwitchToggle = { onEvent(SettingsEvent.ToggleLoggingEnabled) }
         ) {
+            FilledButton(label = "Save logs to text") {
+                File("cleanmeter.${System.currentTimeMillis()}.log").printWriter()
+                    .use { it.print(logSink) }
+            }
             SelectionContainer {
                 Text(
                     text = logSink,
diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/CpuStats.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/CpuStats.kt
@@ -34,7 +34,7 @@ internal fun CpuStats(
         body = { options ->
             Column(modifier = Modifier, verticalArrangement = Arrangement.spacedBy(12.dp)) {
                 options.forEach { option ->
-                    val readings = getCpuSensorReadings().filter { it.SensorType == option.dataType }
+                    val readings = getCpuSensorReadings().filter { it.SensorType == option.dataType }.takeIf { it.isNotEmpty() } ?: getCpuSensorReadings()
 
                     Column(horizontalAlignment = Alignment.Start, modifier = Modifier.fillMaxWidth()) {
                         CheckboxWithLabel(
diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/GpuStats.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/GpuStats.kt
@@ -39,7 +39,7 @@ internal fun GpuStats(
         body = { options ->
             Column(modifier = Modifier, verticalArrangement = Arrangement.spacedBy(12.dp)) {
                 options.forEach { option ->
-                    val readings = getGpuSensorReadings().filter { it.SensorType == option.dataType }
+                    val readings = getGpuSensorReadings().filter { it.SensorType == option.dataType }.takeIf { it.isNotEmpty() } ?: getGpuSensorReadings()
 
                     Column(horizontalAlignment = Alignment.Start, modifier = Modifier.fillMaxWidth()) {
                         CheckboxWithLabel(
diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/NetworkStats.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/NetworkStats.kt
@@ -35,7 +35,7 @@ internal fun NetworkStats(
         body = { options ->
             Column(modifier = Modifier, verticalArrangement = Arrangement.spacedBy(12.dp)) {
                 options.forEach { option ->
-                    val readings = getNetworkSensorReadings().sortedBy { it.HardwareIdentifier }.filter { it.SensorType == option.dataType }
+                    val readings = getNetworkSensorReadings().sortedBy { it.HardwareIdentifier }.filter { it.SensorType == option.dataType }.takeIf { it.isNotEmpty() } ?: getNetworkSensorReadings()
 
                     Column(horizontalAlignment = Alignment.Start, modifier = Modifier.fillMaxWidth()) {
                         CheckboxWithLabel(

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public bool ShouldSerializeHardware()`
`44`	`44`
`45`	`45`	`public class SharedMemorySensor`
`46`	`46`	`{`
`47`		`- public required ISensor Sensor;`
	`47`	`+ public required ISensor HardwareSensor;`
`48`	`48`	`public required string Name { get; set; }`
`49`	`49`	`public required string Identifier { get; set; }`
`50`	`50`	`public required string HardwareIdentifier { get; set; }`