Merge pull request #52 from nutdotnet/45-fix-listvargui

Fix List_Var_Gui error

Author: gbakeman

WinNUT_V2/WinNUT-Client/List_Var_Gui.vb

@@ -11,8 +11,17 @@ Imports WinNUT_Client_Common
 
 Public Class List_Var_Gui
     Private List_Var_Datas As List(Of UPS_List_Datas)
+    Private UPSDevice As UPS_Device
     Private UPS_Name = WinNUT.UPS_Device.Nut_Config.UPSName
 
+    Public Sub New(upsDev As UPS_Device)
+        ' This call is required by the designer.
+        InitializeComponent()
+
+        ' Add any initialization after the InitializeComponent() call.
+        UPSDevice = upsDev
+    End Sub
+
     Private Sub List_Var_Gui_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         LogFile.LogTracing("Load List Var Gui", LogLvl.LOG_DEBUG, Me)
         Icon = WinNUT.Icon
@@ -22,10 +31,13 @@ Public Class List_Var_Gui
     End Sub
 
     Private Sub PopulateTreeView()
-        Dim action As Action
         LogFile.LogTracing("Populate TreeView", LogLvl.LOG_DEBUG, Me)
+        Dim action As Action
+
         Try
+            UPSDevice.IsUpdatingData = False
             List_Var_Datas = WinNUT.UPS_Device.GetUPS_ListVar()
+            UPSDevice.IsUpdatingData = True
         Catch ex As Exception
             ' TODO: Internationalize?
             MessageBox.Show("Error encountered trying to get variables from the UPS: " & vbNewLine & ex.Message, "Error Encountered")

WinNUT_V2/WinNUT-Client/WinNUT.vb

@@ -1003,9 +1003,8 @@ Public Class WinNUT
 
     Private Sub Menu_UPS_Var_Click(sender As Object, e As EventArgs) Handles Menu_UPS_Var.Click
         LogFile.LogTracing("Open List Var Gui", LogLvl.LOG_DEBUG, Me)
-        List_Var_Gui.Activate()
-        List_Var_Gui.Visible = True
-        HasFocus = False
+        Dim lvgForm = New List_Var_Gui(UPS_Device)
+        lvgForm.Show()
     End Sub
 
     Public Sub Update_InstantLog(sender As Object) Handles LogFile.NewData

WinNUT_V2/WinNUT-Client_Common/Nut_Socket.vb

@@ -190,11 +190,11 @@ Public Class Nut_Socket
     ''' <returns>The full <see cref="Transaction"/> of this function call.</returns>
     ''' <exception cref="InvalidOperationException">Thrown when calling this function while disconnected.</exception>"
     ''' <exception cref="NutException">Thrown when the NUT server returns an error or unexpected response.</exception>
-    Function Query_Data(Query_Msg As String) As Transaction ' (Data As String, Response As NUTResponse)
+    Function Query_Data(Query_Msg As String) As Transaction
         Dim Response As NUTResponse
         Dim DataResult As String
         Dim finalTransaction As Transaction
-        ' Try
+
         If streamInUse Then
             LogFile.LogTracing("Attempted to query " & Query_Msg & " while using the stream.", LogLvl.LOG_ERROR, Me)
             Return Nothing
@@ -203,11 +203,12 @@ Public Class Nut_Socket
         streamInUse = True
 
         If ConnectionStatus Then
-            ' LogFile.LogTracing("Sending query " & Query_Msg, LogLvl.LOG_DEBUG, Me)
+            ' LogFile.LogTracing("Query: " & Query_Msg, LogLvl.LOG_DEBUG, Me)
             WriterStream.WriteLine(Query_Msg & vbCr)
             WriterStream.Flush()
 
             DataResult = Trim(ReaderStream.ReadLine())
+            ' LogFile.LogTracing(vbTab & "Response: " & DataResult, LogLvl.LOG_DEBUG, Me)
             streamInUse = False
             ' LogFile.LogTracing("Done processing response for query " & Query_Msg, LogLvl.LOG_DEBUG, Me)
 
@@ -240,13 +241,15 @@ Public Class Nut_Socket
         streamInUse = True
         Dim readLine As String
 
-        Do
+        While True
             readLine = ReaderStream.ReadLine()
-            If readLine.StartsWith("END") Then
-                Exit Do
+
+            If Not readLine.StartsWith("END") Then
+                List_Datas.Add(readLine)
+            Else
+                Exit While
             End If
-            List_Datas.Add(readLine)
-        Loop Until (IsNothing(readLine) Or (ReaderStream.Peek < 0))
+        End While
 
         streamInUse = False
         ' LogFile.LogTracing("Done processing LIST response for query " & Query_Msg, LogLvl.LOG_DEBUG, Me)
@@ -262,21 +265,17 @@ Public Class Nut_Socket
                     'Query 
                     'LIST VAR <upsname>
                     'Response List of var
-                    'VAR <upsname> <varname> "<value>"
+                    'VAR <upsname><varname> "<value>"
                     Key = Replace(SplitString(2), """", "")
                     Value = Replace(SplitString(3), """", "")
                     Dim UPSName = SplitString(1)
                     Dim VarDESC = GetVarDescription(Key)
-                    If Not IsNothing(VarDESC) Then
-                        List_Result.Add(New UPS_List_Datas With {
+                    List_Result.Add(New UPS_List_Datas With {
                             .VarKey = Key,
                             .VarValue = Trim(Value),
-                            .VarDesc = Split(Replace(VarDESC, """", ""), " ", 4)(3)}
+                            .VarDesc = If(Not IsNothing(VarDESC), Split(Replace(VarDESC, """", ""), " ", 4)(3), String.Empty)}
                         )
-                    Else
-                        'TODO: Convert to nut_exception error
-                        Throw New Exception("error")
-                    End If
+
                 Case "UPS"
                     'Query 
                     'LIST UPS
@@ -291,7 +290,7 @@ Public Class Nut_Socket
                     'Query 
                     'LIST RW <upsname>
                     'List of RW var
-                    'RW <upsname> <varname> "<value>"
+                    'RW <upsname><varname> "<value>"
                     Key = Replace(SplitString(2), """", "")
                     Value = Replace(SplitString(3), """", "")
                     Dim UPSName = SplitString(1)
@@ -300,7 +299,7 @@ Public Class Nut_Socket
                         List_Result.Add(New UPS_List_Datas With {
                             .VarKey = Key,
                             .VarValue = Trim(Value),
-                            .VarDesc = Split(Replace(VarDESC, """", ""), " ", 4)(3)}
+                            .VarDesc = If(Not IsNothing(VarDESC), Split(Replace(VarDESC, """", ""), " ", 4)(3), String.Empty)}
                         )
                     Else
                         'TODO: Convert to nut_exception error
@@ -310,12 +309,12 @@ Public Class Nut_Socket
                             'Query 
                             'LIST CMD <upsname>
                             'List of CMD
-                            'CMD <upsname> <cmdname>
+                            'CMD <upsname><cmdname>
                 Case "ENUM"
                     'Query 
                     'LIST ENUM <upsname>
                     'List of Enum ??
-                    'ENUM <upsname> <varname> "<value>"
+                    'ENUM <upsname><varname> "<value>"
                     Key = Replace(SplitString(2), """", "")
                     Value = Replace(SplitString(3), """", "")
                     Dim UPSName = SplitString(1)
@@ -332,14 +331,14 @@ Public Class Nut_Socket
                     End If
                 Case "RANGE"
                             'Query 
-                            'LIST RANGE <upsname> <varname>
+                            'LIST RANGE <upsname><varname>
                             'List of Range
-                            'RANGE <upsname> <varname> "<min>" "<max>"
+                            'RANGE <upsname><varname> "<min>" "<max>"
                 Case "CLIENT"
                     'Query 
                     'LIST CLIENT <upsname>
                     'List of Range
-                    'CLIENT <device name> <client IP address>
+                    'CLIENT <device name><client IP address>
             End Select
         Next
 

WinNUT_V2/WinNUT-Client_Common/UPS_Device.vb

@@ -40,6 +40,16 @@ Public Class UPS_Device
         End Set
     End Property
 
+    Public Property IsUpdatingData As Boolean
+        Get
+            Return Update_Data.Enabled
+        End Get
+        Set(value As Boolean)
+            LogFile.LogTracing("UPS device updating status is now [" & value & "]", LogLvl.LOG_NOTICE, Me)
+            Update_Data.Enabled = value
+        End Set
+    End Property
+
     Private upsData As UPSData
     Public Property UPS_Datas As UPSData
         Get
@@ -303,15 +313,8 @@ Public Class UPS_Device
         Try
             Dim UPS_rt_Status As String
             Dim InputA As Double
-            ' LogFile.LogTracing("Enter Retrieve_UPS_Data", LogLvl.LOG_DEBUG, Me)
-            If IsConnected Then
-                'With UPS_Datas
-                '    Select Case "Unknown"
-                '        Case .Mfr, .Model, .Serial, .Firmware
-                '            UPS_Datas = GetUPSProductInfo()
-                '    End Select
-                'End With
 
+            If IsConnected Then
                 With UPS_Datas.UPS_Value
                     .Batt_Charge = Double.Parse(GetUPSVar("battery.charge", 255), ciClone)
                     .Batt_Voltage = Double.Parse(GetUPSVar("battery.voltage", 12), ciClone)