change back to parse string to get name building instead of bld obj

Author: vinaghost

TbsCore/Core/TaskExecutor.cs

@@ -232,19 +232,8 @@ private static void UpdateCurrentlyBuilding(Account acc, Village vill)
             var cb = InfrastructureParser.CurrentlyBuilding(acc.Wb.Html, acc);
             if (cb == null) return; // Nothing is currently building
 
-            var bldJson = DriverHelper.GetJsObj<string>(acc, "JSON.stringify(bld);");
-            if (string.IsNullOrEmpty(bldJson)) return;
-            var bldJs = JsonConvert.DeserializeObject<List<Bld>>(bldJson);
-
-            // Combine data from two sources about currently building (JS object and HTML table)
-            // We get time duration and level from HTML
-            // and build location, level and building (type) from JSON
             for (int i = 0; i < cb.Count; i++)
             {
-                cb[i].Building = bldJs[i].Building;
-                cb[i].Location = bldJs[i].Location;
-                cb[i].Level = (byte)bldJs[i].Level;
-
                 vill.Build.CurrentlyBuilding.Add(cb[i]);
             }
         }

TbsCore/Parsers/InfrastructureParser.cs

@@ -73,11 +73,16 @@ public static List<BuildingCurrently> CurrentlyBuilding(HtmlDocument htmlDoc, Ac
             {
                 var duration = TimeParser.ParseTimer(row);
                 var level = row.Descendants("span").FirstOrDefault(x => x.HasClass("lvl")).InnerText;
+                var strName = row.Descendants("div").FirstOrDefault(x => x.HasClass("name")).ChildNodes[0].InnerText.Trim(new[] { '\t', '\n', '\r', ' ' });
+                strName = string.Join("", strName.Split(default(string[]), StringSplitOptions.RemoveEmptyEntries));
+                Enum.TryParse(strName, out Classificator.BuildingEnum name);
 
                 ret.Add(new BuildingCurrently()
                 {
+                    Building = name,
                     Duration = DateTime.Now.Add(duration),
                     Level = (byte)Parser.RemoveNonNumeric(level),
+                    Location = -1,
                 });
             }
             return ret;