Merge pull request #80 from Erol444/fix-currently-building

Fix currently building update

Author: Erol444

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/Helpers/BuildingHelper.cs

@@ -243,11 +243,11 @@ public static bool RemoveFinishedCB(Village vill)
 
             foreach (var taskDone in tasksDone)
             {
-                var building = vill.Build.Buildings.FirstOrDefault(x => x.Id == taskDone.Location);
-                if (building == null) building = vill.Build.Buildings.FirstOrDefault(x => x.Type == taskDone.Building);
-                if (building == null || building.Type != taskDone.Building) continue;
+                //var building = vill.Build.Buildings.FirstOrDefault(x => x.Id == taskDone.Location);
+                //if (building == null) building = vill.Build.Buildings.FirstOrDefault(x => x.Type == taskDone.Building);
+                //if (building == null || building.Type != taskDone.Building) continue;
 
-                if (building.Level < taskDone.Level) building.Level = taskDone.Level;
+                //if (building.Level < taskDone.Level) building.Level = taskDone.Level;
                 vill.Build.CurrentlyBuilding.Remove(taskDone);
             }
             return true;
@@ -294,11 +294,11 @@ public static bool IsTaskCompleted(Village vill, Account acc, BuildingTask task)
                     if (task.Level <= building.Level) return true;
 
                     // If the building is being upgraded to the desired level, task is complete
-                    var cb = vill.Build
-                        .CurrentlyBuilding
-                        .OrderByDescending(x => x.Level)
-                        .FirstOrDefault(x => x.Location == task.BuildingId);
-                    if (cb != null && task.Level <= cb.Level) return true;
+                    //var cb = vill.Build
+                    //    .CurrentlyBuilding
+                    //    .OrderByDescending(x => x.Level)
+                    //    .FirstOrDefault(x => x.Location == task.BuildingId);
+                    //if (cb != null && task.Level <= cb.Level) return true;
                     break;
 
                 case BuildingType.AutoUpgradeResFields:
@@ -440,10 +440,14 @@ internal static bool UpgradeBuildingForOneLvl(Account acc, Village vill, Buildin
                 }, bottom);
             }
 
+            // Current lvl in bot's data
             var currentLvl = (int)upgrade.Level;
 
             RemoveFinishedCB(vill);
-            currentLvl += vill.Build.CurrentlyBuilding.Count(x => x.Building == building);
+
+            // Current lvl in current building list
+            var currentBuilding = vill.Build.CurrentlyBuilding.FirstOrDefault(x => x.Building == building);
+            if (currentBuilding != null) currentLvl = currentBuilding.Level;
 
             if (BuildingsData.MaxBuildingLevel(acc, building) == currentLvl)
             {

TbsCore/Models/VillageModels/BuildingCurrently.cs

@@ -8,6 +8,6 @@ public class BuildingCurrently
         public DateTime Duration { get; set; }
         public byte Level { get; set; }
         public BuildingEnum Building { get; set; }
-        public int Location { get; set; }
+        //public int Location { get; set; }
     }
 }

TbsCore/Parsers/InfrastructureParser.cs

@@ -73,9 +73,13 @@ 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),
                 });

TbsCore/Tasks/LowLevel/UpgradeBuilding.cs

@@ -150,12 +150,12 @@ private async Task<TaskRes> Upgrade(Account acc, HtmlNode node)
             var building = Vill.Build.Buildings.FirstOrDefault(x => x.Id == this.Task.BuildingId);
             lvl = building.Level;
             // Check if building is under construction
-            if (building.UnderConstruction)
-            {
-                // Check currently building
-                var cb = Vill.Build.CurrentlyBuilding.OrderByDescending(x => x.Level).FirstOrDefault(x => x.Location == building.Id);
-                if (cb != null && lvl < cb.Level) lvl = cb.Level;
-            }
+            //if (building.UnderConstruction)
+            //{
+            //    // Check currently building
+            //    var cb = Vill.Build.CurrentlyBuilding.OrderByDescending(x => x.Level).FirstOrDefault(x => x.Location == building.Id);
+            //    if (cb != null && lvl < cb.Level) lvl = cb.Level;
+            //}
 
             if (Task.Level <= lvl)
             {
@@ -248,11 +248,11 @@ private async Task PostTaskCheckDorf(Account acc)
             }
 
             // Check if the task is completed
-            var taskCb = Vill.Build
-                .CurrentlyBuilding
-                .OrderByDescending(x => x.Level)
-                .FirstOrDefault(x => x.Location == this.Task.BuildingId);
-            if (taskCb != null && this.Task.TaskType == BuildingType.General && this.Task.Level <= taskCb.Level) RemoveCurrentTask();
+            //var taskCb = Vill.Build
+            //    .CurrentlyBuilding
+            //    .OrderByDescending(x => x.Level)
+            //    .FirstOrDefault(x => x.Location == this.Task.BuildingId);
+            //if (taskCb != null && this.Task.TaskType == BuildingType.General && this.Task.Level <= taskCb.Level) RemoveCurrentTask();
         }
 
         /// <summary>