# HG changeset patch
# User moel.mich
# Date 1376862248 0
# Node ID 055a9ec117d214414d24ca2d8b56086f2be6508d
# Parent  46c056e76130097bd6540b283125cf8e90f63e0a
Fixed a few stability issues in the logging implementation. Added support for logging sensors once the reappear.

diff -r 46c056e76130 -r 055a9ec117d2 GUI/MainForm.cs
--- a/GUI/MainForm.cs	Sun Aug 11 21:26:56 2013 +0000
+++ b/GUI/MainForm.cs	Sun Aug 18 21:44:08 2013 +0000
@@ -150,6 +150,8 @@
         wmiProvider = new WmiProvider(computer);
       }
 
+      logger = new Logger(computer);
+
       plotColorPalette = new Color[13];
       plotColorPalette[0] = Color.Blue;
       plotColorPalette[1] = Color.OrangeRed;
@@ -281,8 +283,7 @@
       };
 
       logSensors = new UserOption("logSensorsMenuItem", false, logSensorsMenuItem,
-        settings);
-      logger = new Logger(computer);
+        settings);      
 
       InitializePlotForm();
 
@@ -497,6 +498,7 @@
       Close();
     }
 
+    private int delayCount = 0;
     private void timer_Tick(object sender, EventArgs e) {
       computer.Accept(updateVisitor);
       treeView.Invalidate();
@@ -508,8 +510,12 @@
       if (wmiProvider != null)
         wmiProvider.Update();
 
-      if (logSensors.Value)
+
+      if (logSensors.Value && delayCount >= 4)
         logger.Log();
+
+      if (delayCount < 4)
+        delayCount++;
     }
 
     private void SaveConfiguration() {
diff -r 46c056e76130 -r 055a9ec117d2 Properties/AssemblyVersion.cs
--- a/Properties/AssemblyVersion.cs	Sun Aug 11 21:26:56 2013 +0000
+++ b/Properties/AssemblyVersion.cs	Sun Aug 18 21:44:08 2013 +0000
@@ -10,5 +10,5 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.6.0.8")]
-[assembly: AssemblyInformationalVersion("0.6.0.8 Alpha")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.6.0.9")]
+[assembly: AssemblyInformationalVersion("0.6.0.9 Alpha")]
\ No newline at end of file
diff -r 46c056e76130 -r 055a9ec117d2 Utilities/Logger.cs
--- a/Utilities/Logger.cs	Sun Aug 11 21:26:56 2013 +0000
+++ b/Utilities/Logger.cs	Sun Aug 18 21:44:08 2013 +0000
@@ -25,6 +25,7 @@
 
     private DateTime day = DateTime.MinValue;
     private string fileName;
+    private string[] identifiers;
     private ISensor[] sensors;
 
     public Logger(IComputer computer) {
@@ -34,6 +35,7 @@
     }
 
     private void HardwareRemoved(IHardware hardware) {
+      hardware.SensorAdded -= SensorAdded;
       hardware.SensorRemoved -= SensorRemoved;
       foreach (ISensor sensor in hardware.Sensors)
         SensorRemoved(sensor);
@@ -42,12 +44,28 @@
     }
 
     private void HardwareAdded(IHardware hardware) {
+      foreach (ISensor sensor in hardware.Sensors)
+        SensorAdded(sensor);
+      hardware.SensorAdded += SensorAdded;
       hardware.SensorRemoved += SensorRemoved;
       foreach (IHardware subHardware in hardware.SubHardware)
         HardwareAdded(subHardware);
     }
 
+    private void SensorAdded(ISensor sensor) {
+      if (sensors == null)
+        return;
+
+      for (int i = 0; i < sensors.Length; i++) {
+        if (sensor.Identifier.ToString() == identifiers[i])
+          sensors[i] = sensor;
+      }
+    }
+
     private void SensorRemoved(ISensor sensor) {
+      if (sensors == null)
+        return;
+
       for (int i = 0; i < sensors.Length; i++) {
         if (sensor == sensors[i])
           sensors[i] = null;
@@ -59,27 +77,10 @@
         Path.DirectorySeparatorChar + string.Format(fileNameFormat, date);
     }
 
-    private void AddSensorRemovedHandler() {
-      for (int i = 0; i < sensors.Length; i++) {
-        ISensor sensor = sensors[i];
-        int index = i;
-        SensorEventHandler handler = null;        
-        handler = s => {
-          if (s != sensor) 
-            return;
-
-          sensors[index] = null;
-          sensor.Hardware.SensorRemoved -= handler;          
-        };
-        sensor.Hardware.SensorRemoved += handler;
-      }
-    }
-
     private bool OpenExistingLogFile() {
       if (!File.Exists(fileName))
         return false;
 
-      string[] identifiers;
       try {
         String line;
         using (StreamReader reader = new StreamReader(fileName)) 
@@ -90,11 +91,14 @@
         
         identifiers = line.Split(',').Skip(1).ToArray();
       } catch {
+        identifiers = null;
         return false;
       }
 
-      if (identifiers.Length == 0)
+      if (identifiers.Length == 0) {
+        identifiers = null;
         return false;
+      }
 
       sensors = new ISensor[identifiers.Length];
       SensorVisitor visitor = new SensorVisitor(sensor => {
@@ -112,7 +116,8 @@
         list.Add(sensor);
       });
       visitor.VisitComputer(computer);
-      sensors = list.ToArray();      
+      sensors = list.ToArray();
+      identifiers = sensors.Select(s => s.Identifier.ToString()).ToArray();
 
       using (StreamWriter writer = new StreamWriter(fileName, false)) {
         writer.Write(",");
@@ -139,7 +144,7 @@
 
     public void Log() {
       var now = DateTime.Now;
-      if (day != now.Date) {
+      if (day != now.Date || !File.Exists(fileName)) {
         day = now.Date;
         fileName = GetFileName(day);
 
@@ -147,23 +152,25 @@
           CreateNewLogFile();
       }
 
-      using (StreamWriter writer = new StreamWriter(fileName, true)) {
-        writer.Write(now.ToString("G", CultureInfo.InvariantCulture));
-        writer.Write(",");
-        for (int i = 0; i < sensors.Length; i++) {
-          if (sensors[i] != null) {
-            float? value = sensors[i].Value;
-            if (value.HasValue)
-              writer.Write(
-                value.Value.ToString("R", CultureInfo.InvariantCulture));
+      try {
+        using (StreamWriter writer = new StreamWriter(new FileStream(fileName,
+          FileMode.Append, FileAccess.Write, FileShare.ReadWrite))) {
+          writer.Write(now.ToString("G", CultureInfo.InvariantCulture));
+          writer.Write(",");
+          for (int i = 0; i < sensors.Length; i++) {
+            if (sensors[i] != null) {
+              float? value = sensors[i].Value;
+              if (value.HasValue)
+                writer.Write(
+                  value.Value.ToString("R", CultureInfo.InvariantCulture));
+            }
+            if (i < sensors.Length - 1)
+              writer.Write(",");
+            else
+              writer.WriteLine();
           }
-          if (i < sensors.Length - 1)
-            writer.Write(",");
-          else
-            writer.WriteLine();
         }
-      }
-
+      } catch (IOException) { }
     }
   }
 }