Fixed json building while reading non-global vars

fbarresi · May 8, 2021 · 474bf2e · 474bf2e
1 parent c4dbaaa
commit 474bf2e
Showing 1 changed file with 39 additions and 1 deletion.
diff --git a/TwinCatAdsTool.Logic/Services/PersistentVariableService.cs b/TwinCatAdsTool.Logic/Services/PersistentVariableService.cs
@@ -81,9 +81,47 @@ public async Task<JObject> ReadGlobalPersistentVariables(AdsClient client, IInst
                                 uo.Add(up);
                             }
                         }
-                        jobj.Add(element.Key, uo);
+                        var path = element.Key.Split(".");
+                        if (path.Count() == 1)
+                        {
+                            jobj.Add(element.Key, uo);
+                        }
+                        else
+                        {
+                            for(var i = 0; i < path.Length-1; i++)
+                            {
+                                if ((jobj.SelectToken(string.Join(".", path.Take(i+1))) as JObject) == null)
+                                {
+                                    if (i > 1)
+                                    {
+                                        (jobj.SelectToken(string.Join(".", path.Take(i))) as JObject).Add(path[i], new JObject());
+                                    }
+                                    else
+                                    {
+                                        jobj.Add(path[i], new JObject());
+                                    }
+                                }
+                            }
 
+                            try
+                            {
+                                (jobj.SelectToken(string.Join(".", path.Take(path.Length - 1))) as JObject).Add(path.Last(), uo);
+                            }
+                            catch(ArgumentException)
+                            {
+                                var token = (jobj.SelectToken(string.Join(".", path)) as JObject);
+                                if(token != null)
+                                {
+                                    foreach (var prop in uo.Properties())
+                                    {
+                                        token.Add(prop.Name, prop.Value);
+                                    }
+                                }
+                            }
+                        }
+
                     }
+
                 }
             }
             catch (Exception e)