Merge pull request #92 from Erol444/weekly-26-03-2022

Weekly 26 03 2022

Author: Erol444

.github/workflows/pre-release.yml

@@ -38,7 +38,7 @@ jobs:
       - name: 'Create changelog'
         id: Changelog
         run: |
-          changelog=$(git log --no-merges --pretty=format:'- %s' ${{ steps.previoustag.outputs.tag }}..HEAD --reverse)
+          changelog="$({github.event.pull_request.body})"
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"

.github/workflows/release.yml

@@ -40,8 +40,7 @@ jobs:
       - name: 'Create changelog'
         id: Changelog
         run: |
-          last=$(git log --merges --grep='develop' --first-parent master --pretty=format:"%h" | sed -n '2p')
-          changelog=$(git log --no-merges --pretty=format:'- %s' $last..HEAD --reverse)
+          changelog="$({github.event.pull_request.body})"
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"

TbsCore/Assets/ChromeExtension/DisableWebRTCLeak.crx

@@ -228,7 +228,7 @@ public static List<Action> GetPostLoadTasks(Account acc)
                     // Update adventures
                     if(homeVill == null)
                     {
-                        acc.Tasks.Add( new HeroUpdateInfo() { ExecuteAt = DateTime.Now });
+                        acc.Tasks.Add( new HeroUpdateInfo() { ExecuteAt = DateTime.Now }, true);
                     }
                     else if (heroReady &&
                         (homeVill.Build.Buildings.Any(x => x.Type == Classificator.BuildingEnum.RallyPoint && 0 < x.Level)) &&
@@ -289,12 +289,12 @@ private static void AutoExpandStorage(Account acc, Village vill)
                 warehouse_delta <= vill.Res.Stored.Resources.Clay ||
                 warehouse_delta <= vill.Res.Stored.Resources.Iron)
             {
-                BuildingHelper.UpgradeBuildingForOneLvl(acc, vill, Classificator.BuildingEnum.Warehouse, false);
+                UpgradeBuildingHelper.UpgradeBuildingForOneLvl(acc, vill, Classificator.BuildingEnum.Warehouse, false);
                 return;
             }
 
             if (granary_delta <= vill.Res.Stored.Resources.Crop)
-                BuildingHelper.UpgradeBuildingForOneLvl(acc, vill, Classificator.BuildingEnum.Granary, false);
+                UpgradeBuildingHelper.UpgradeBuildingForOneLvl(acc, vill, Classificator.BuildingEnum.Granary, false);
         }
 
         private static void DonateToAlly(Account acc, Village vill)

TbsCore/Assets/ChromeExtension/audiocontext-fingerprint.crx

@@ -1,15 +1,9 @@
-using Newtonsoft.Json;
+using OpenQA.Selenium;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-
-using OpenQA.Selenium;
-
 using TbsCore.Extensions;
-using TbsCore.Helpers;
 using TbsCore.Models.AccModels;
-using TbsCore.Models.JsObjects;
 using TbsCore.Models.VillageModels;
 using TbsCore.Parsers;
 using TbsCore.Tasks;
@@ -81,50 +75,57 @@ public static async Task Execute(Account acc, BotTask task)
             await Task.Delay(AccountHelper.Delay(acc));
 
             if (task.Vill == null) task.Vill = acc.Villages.FirstOrDefault(x => x.Active);
-
-            acc.Logger.Information($"Executing task {task.GetName()}" + (task.Vill == null ? "" : $" in village {task.Vill.Name}"));
-
-            try
+            acc.Logger.Information($"Executing task {task.GetName()} in village {task.Vill?.Name}");
+            TaskRes taskRes = TaskRes.Executed;
+            do
             {
-                switch (await task.Execute(acc))
+                try
                 {
-                    case TaskRes.Retry:
-                        task.RetryCounter++;
-                        if (task.NextExecute == null) task.NextExecute = DateTime.Now.AddMinutes(3);
-                        break;
-
-                    default:
-                        task.RetryCounter = 0;
-                        if (task.NextTask != null)
-                        {
-                            task.NextTask.ExecuteAt = DateTime.MinValue.AddHours(5);
-                            task.NextTask.Stage = TaskStage.Start;
-                            acc.Tasks.Add(task.NextTask);
-                            task.NextTask = null;
-                        }
-                        break;
+                    taskRes = await task.Execute(acc);
+                    break;
                 }
-            }
-            catch (WebDriverException e) when (e.Message.Contains("chrome not reachable") || e.Message.Contains("no such window:"))
-            {
-                acc.Logger.Warning($"Chrome has problem while executing task {task.GetName()}! Vill {task.Vill?.Name}. Try reopen Chrome");
-
-                acc.Tasks.Add(new ReopenDriver()
+                catch (WebDriverException e) when (e.Message.Contains("chrome not reachable") || e.Message.Contains("no such window:"))
                 {
-                    ExecuteAt = DateTime.MinValue,
-                    Priority = TaskPriority.High,
-                    ReopenAt = DateTime.MinValue
-                });
-
-                //try exccute task after we reopen chrome 1 mintues
+                    acc.Logger.Warning($"Chrome has problem while executing task {task.GetName()}! Vill {task.Vill?.Name}. Try reopen Chrome");
 
-                if (task.NextExecute == null) task.NextExecute = DateTime.MinValue.AddMinutes(1); // make sure current task is excuted after reopen driver
+                    acc.Wb.Close();
+                    await acc.Wb.Init(acc);
+                }
+                catch (Exception e)
+                {
+                    acc.Logger.Error(e, $"Error executing task {task.GetName()}! Vill {task.Vill?.Name}");
+                    task.RetryCounter++;
+                    if (task.NextExecute == null)
+                    {
+                        task.NextExecute = DateTime.Now.AddMinutes(3);
+                        acc.Tasks.ReOrder();
+                    }
+                    break;
+                }
             }
-            catch (Exception e)
+            while (true);
+
+            switch (taskRes)
             {
-                acc.Logger.Error(e, $"Error executing task {task.GetName()}! Vill {task.Vill?.Name}");
-                task.RetryCounter++;
-                if (task.NextExecute == null) task.NextExecute = DateTime.Now.AddMinutes(3);
+                case TaskRes.Retry:
+                    task.RetryCounter++;
+                    if (task.NextExecute == null)
+                    {
+                        task.NextExecute = DateTime.Now.AddMinutes(3);
+                        acc.Tasks.ReOrder();
+                    }
+                    break;
+
+                default:
+                    task.RetryCounter = 0;
+                    if (task.NextTask != null)
+                    {
+                        task.NextTask.ExecuteAt = DateTime.MinValue.AddHours(5);
+                        task.NextTask.Stage = TaskStage.Start;
+                        acc.Tasks.Add(task.NextTask);
+                        task.NextTask = null;
+                    }
+                    break;
             }
 
             //We want to re-execute the same task later
@@ -135,18 +136,18 @@ public static async Task Execute(Account acc, BotTask task)
                 acc.Tasks.ReOrder();
 
                 task.Stage = TaskStage.Start;
-                acc.Logger.Warning($"Task {task.GetName()}" + (task.Vill == null ? "" : $" in village {task.Vill.Name} will be re-executed at {task.ExecuteAt}"));
+                acc.Logger.Warning($"Task {task.GetName()} in village {task.Vill?.Name} will be re-executed at {task.ExecuteAt}");
                 return;
             }
             // Remove the task from the task list
             acc.Tasks.Remove(task);
             if (task.RetryCounter >= 3)
             {
-                acc.Logger.Warning($"Task {task.GetName()}" + (task.Vill == null ? "" : $" in village {task.Vill.Name} is already re-executed 3 times. Ignore it"));
+                acc.Logger.Warning($"Task {task.GetName()} in village {task.Vill?.Name} is already re-executed 3 times. Ignore it");
             }
             else
             {
-                acc.Logger.Information($"Task {task.GetName()}" + (task.Vill == null ? "" : $" in village {task.Vill.Name} is done."));
+                acc.Logger.Information($"Task {task.GetName()} in village {task.Vill?.Name} is done.");
             }
         }
 
@@ -180,8 +181,6 @@ public static void UpdateDorf2Info(Account acc)
             //remove any further UpdateDorf2 BotTasks for this village (if below 5min)
             acc.Tasks.Remove(typeof(UpdateDorf2), vill, 5);
 
-            UpdateCurrentlyBuilding(acc, vill);
-
             var buildings = InfrastructureParser.GetBuildings(acc, acc.Wb.Html);
             foreach (var field in buildings)
             {
@@ -190,6 +189,8 @@ public static void UpdateDorf2Info(Account acc)
                 building.Type = field.Type;
                 building.UnderConstruction = field.UnderConstruction;
             }
+
+            UpdateCurrentlyBuilding(acc, vill);
         }
 
         public static void UpdateDorf1Info(Account acc)
@@ -200,8 +201,6 @@ public static void UpdateDorf1Info(Account acc)
             //remove any further UpdateDorf1 BotTasks for this village (if below 5min)
             acc.Tasks.Remove(typeof(UpdateDorf1), vill, 5);
 
-            UpdateCurrentlyBuilding(acc, vill);
-
             var dorf1Movements = TroopsMovementParser.ParseDorf1Movements(acc.Wb.Html);
 
             // Check attacks if there are incoming attacks and alerts aren't disabled and task isn't already on task list
@@ -224,16 +223,21 @@ public static void UpdateDorf1Info(Account acc)
                 building.Type = field.Type;
                 building.UnderConstruction = field.UnderConstruction;
             }
+
+            UpdateCurrentlyBuilding(acc, vill);
         }
 
         private static void UpdateCurrentlyBuilding(Account acc, Village vill)
         {
             vill.Build.CurrentlyBuilding.Clear();
-            var cb = InfrastructureParser.CurrentlyBuilding(acc.Wb.Html, acc);
+            var cb = InfrastructureParser.CurrentlyBuilding(acc.Wb.Html);
             if (cb == null) return; // Nothing is currently building
 
             for (int i = 0; i < cb.Count; i++)
             {
+                var build = vill.Build.Buildings.FirstOrDefault(x => x.Type == cb[i].Building && x.Level - cb[i].Level < 3);
+                if (build == null) continue;
+                cb[i].Location = build.Id;
                 vill.Build.CurrentlyBuilding.Add(cb[i]);
             }
         }