Resolve Issue qJake#4 - Correct JSON Parsing based on the Property Na…

…me in the JSON instead of guessing @ the Index number
BobDaMann · Feb 21, 2016 · f4e68e9 · f4e68e9
1 parent aca2039
commit f4e68e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/SharpHue/Lights/LightCollection.cs b/SharpHue/Lights/LightCollection.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Net.Http;
 using Newtonsoft.Json.Linq;
+using System;
 
 namespace SharpHue
 {
@@ -69,20 +70,13 @@ public void Refresh()
 
             JObject lights = JsonClient.RequestSecure(HttpMethod.Get, "/lights") as JObject;
 
-            for (int i = 1; i <= Configuration.MAX_LIGHTS; i++)
+            foreach (KeyValuePair<string, JToken> light in lights)
             {
-                if (lights[i.ToString()] != null)
-                {
-                    Light l = ((JObject)lights[i.ToString()]).ToObject<Light>();
-                    l.ID = i;
-                    l.RefreshState();
-                    Lights.Add(l);
-                }
-                else
-                {
-                    // Lights are sequential, break if we don't have a light with the specified index.
-                    break;
-                }
+                Light l = new Light();
+                l = light.Value.ToObject<Light>();
+                l.ID = Convert.ToInt16(light.Key);
+                Lights.Add(l);
+                l.RefreshState();
             }
         }
 

diff --git a/SharpHue/SharpHue.csproj b/SharpHue/SharpHue.csproj
@@ -100,9 +100,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />