Added querying by attribute value, started refactoring UrlHelper

Erol444 · Erol444 · commit 1c47098c7727 · 2021-11-28T14:33:43.000+01:00
diff --git a/TbsCore/Helpers/DriverHelper.cs b/TbsCore/Helpers/DriverHelper.cs
@@ -94,6 +94,7 @@ internal static async Task WriteCoordinates(Account acc, Coordinates coordinates
             await WriteById(acc, "yCoordInput", coordinates.y);
         }
 
+        #region By Id
         public static async Task<bool> ClickById(Account acc, string query, bool log = true) =>
             await ExecuteAction(acc, new QueryById(query), new ActionClick(), log);
 
@@ -105,6 +106,9 @@ public static async Task<bool> CheckById(Account acc, string query, bool check,
 
         public static async Task<bool> SelectIndexById(Account acc, string query, int index, bool log = true) =>
             await ExecuteAction(acc, new QueryById(query), new ActionSelectIndex(index), log);
+        #endregion
+
+        #region By Class Name
 
         public static async Task<bool> ClickByClassName(Account acc, string query, bool log = true) =>
             await ExecuteAction(acc, new QueryByClassName(query), new ActionClick(), log);
@@ -117,6 +121,9 @@ public static async Task<bool> CheckByClassName(Account acc, string query, bool
 
         public static async Task<bool> SelectIndexByClassName(Account acc, string query, int index, bool log = true) =>
             await ExecuteAction(acc, new QueryByClassName(query), new ActionSelectIndex(index), log);
+        #endregion
+
+        #region By Name
 
         public static async Task<bool> ClickByName(Account acc, string query, bool log = true) =>
             await ExecuteAction(acc, new QueryByName(query), new ActionClick(), log);
@@ -129,47 +136,56 @@ public static async Task<bool> CheckByName(Account acc, string query, bool check
 
         public static async Task<bool> SelectIndexByName(Account acc, string query, int index, bool log = true) =>
             await ExecuteAction(acc, new QueryByName(query), new ActionSelectIndex(index), log);
+        #endregion
+
+        #region By Attribute Value
+        public static async Task<bool> ClickByAttributeValue(Account acc, string attribute, string value, bool log = true) =>
+            await ExecuteAction(acc, new QueryByAttributeVal(attribute, value), new ActionClick(), log);
+
+        public static async Task<bool> WriteByAttributeValue(Account acc, string attribute, string value, object text, bool log = true, bool update = true) =>
+            await ExecuteAction(acc, new QueryByAttributeVal(attribute, value), new ActionWrite(text), log, update);
+
+        public static async Task<bool> CheckByAttributeValue(Account acc, string attribute, string value, bool check, bool log = true) =>
+            await ExecuteAction(acc, new QueryByAttributeVal(attribute, value), new ActionCheck(check), log);
+
+        public static async Task<bool> SelectByAttributeValue(Account acc, string attribute, string value, int index, bool log = true) =>
+            await ExecuteAction(acc, new QueryByAttributeVal(attribute, value), new ActionSelectIndex(index), log);
+        #endregion
 
         private static async Task<bool> ExecuteAction(Account acc, Query query, Action action, bool log = true, bool update = true) =>
             await ExecuteScript(acc, $"document.{query.val}{action.val}", log, update);
 
         public class QueryById : Query
-
         { public QueryById(string str) => base.val = $"getElementById('{str}')"; }
 
         public class QueryByName : Query
-
         { public QueryByName(string str) => base.val = $"getElementsByName('{str}')[0]"; }
 
         public class QueryByClassName : Query
-
         { public QueryByClassName(string str) => base.val = $"getElementsByClassName('{str}')[0]"; }
 
-        public class ActionWrite : Action
+        public class QueryByAttributeVal : Query
+        { public QueryByAttributeVal(string attribute, string value) => base.val = $"querySelectorAll('[{attribute}=\"{value}\"]')[0]"; }
 
+
+        public class ActionWrite : Action
         { public ActionWrite(object str) => base.val = $".value='{str}';"; }
 
         public class ActionClick : Action
-
         { public ActionClick() => base.val = ".click();"; }
-
         public class ActionCheck : Action
-
         { public ActionCheck(bool check) => base.val = $".checked={(check ? "true" : "false")};"; }
 
         public class ActionSelectIndex : Action
-
         { public ActionSelectIndex(int index) => base.val = $".selectedIndex = {index};"; }
 
-        public abstract class Action
-        { public string val; }
+        public abstract class Action { public string val; }
 
-        public abstract class Query
-        { public string val; }
+        public abstract class Query { public string val; }
 
-        public static async Task WaitLoaded(Account acc, int delay = 10)
+        public static async Task WaitLoaded(Account acc, int delay = 15)
         {
-            var wait = new WebDriverWait(acc.Wb.Driver, TimeSpan.FromMinutes(delay));
+            var wait = new WebDriverWait(acc.Wb.Driver, TimeSpan.FromSeconds(delay));
             wait.Until(driver => ((IJavaScriptExecutor)driver).ExecuteScript("return document.readyState").Equals("complete"));
             acc.Wb.UpdateHtml();
             await TaskExecutor.PageLoaded(acc);
diff --git a/TbsCore/Helpers/UrlHelper.cs b/TbsCore/Helpers/UrlHelper.cs
@@ -12,49 +12,29 @@ public static class UrlHelper
     {
         public static async Task<bool> MainNavigate(Account acc, HtmlDocument html, MainNavigationButton button)
         {
-            var nav = html.DocumentNode.Descendants("div").FirstOrDefault(x => x.Id.CompareTo("navigation") == 0);
+            var nav = html.GetElementbyId("navigation");
             if (nav == null) return false;
             var accessKey = (int)button;
-            var a = nav.Descendants("a").FirstOrDefault(x => x.GetAttributeValue("accesskey", 8) == accessKey);
-            if (a == null) return false;
-
-            acc.Wb.FindElementByXPath($"//a[@accesskey={accessKey}]").Click();
-            await DriverHelper.WaitLoaded(acc);
+            await DriverHelper.ClickByAttributeValue(acc, "accesskey", accessKey.ToString());
             return true;
         }
 
         public static async Task<bool> BuildNavigate(Account acc, HtmlDocument html, int index)
         {
             if (index < 19) // dorf1
             {
-                var fields = html.DocumentNode.Descendants("div").FirstOrDefault(x => x.Id.CompareTo("resourceFieldContainer") == 0);
-                if (fields == null) return false;
-                var field = fields.Descendants("a").FirstOrDefault(x => x.HasClass($"buildingSlot{index}"));
-                if (field == null) return false;
-
-                acc.Wb.FindElementByXPath($"//a[contains(concat(' ', @class, ' '), ' buildingSlot{index} ')]").Click();
-                await DriverHelper.WaitLoaded(acc);
-                return true;
+                if (!acc.Wb.CurrentUrl.Contains("dorf1.php") || acc.Wb.CurrentUrl.Contains("id="))
+                    await MainNavigate(acc, html, MainNavigationButton.Resources);
+                await DriverHelper.ClickByClassName(acc, $"buildingSlot{index}");
             }
             else // dorf2
             {
-                var fields = html.DocumentNode.Descendants("div").FirstOrDefault(x => x.Id.CompareTo("villageContent") == 0);
-                if (fields == null) return false;
-                var field = fields.Descendants("div").FirstOrDefault(x => x.HasClass($"a{index}"));
-                if (field == null) return false;
-                var g = field.Descendants("g").FirstOrDefault();
-                if (g == null) // empty building
-                {
-                    acc.Wb.FindElementByXPath($"//div[contains(concat(' ', @class, ' '), ' a{index} ')]/*[name()='svg']/*").Click();
-                }
-                else // there is building
-                {
-                    acc.Wb.FindElementByXPath($"//div[contains(concat(' ', @class, ' '), ' a{index} ')]/a").Click();
-                }
-
-                await DriverHelper.WaitLoaded(acc);
-                return true;
+                if (!acc.Wb.CurrentUrl.Contains("dorf2.php") || acc.Wb.CurrentUrl.Contains("id="))
+                    await MainNavigate(acc, html, MainNavigationButton.Buildings);
+                await DriverHelper.ClickByClassName(acc, $"aid{index}");
             }
+            await DriverHelper.WaitLoaded(acc);
+            return true;
         }
 
         public static async Task<bool> RallyPointNavigate(Account acc, HtmlDocument html, RallyPointTab index)
diff --git a/TbsCore/Helpers/VillageHelper.cs b/TbsCore/Helpers/VillageHelper.cs
@@ -6,6 +6,7 @@
 using TbsCore.Models.VillageModels;
 using TbsCore.Parsers;
 using TbsCore.Tasks.LowLevel;
+using TbsCore.TravianData;
 using static TbsCore.Helpers.Classificator;
 
 namespace TbsCore.Helpers
@@ -110,6 +111,16 @@ public static async Task SwitchVillage(Account acc, int id)
         /// <returns>Whether it was successful</returns>
         public static async Task<bool> EnterBuilding(Account acc, Building building, string query = "", bool dorf = true, bool update = false)
         {
+            // If multiple tabs, re-navigate to the building!
+            if (BuildingsData.HasMultipleTabs(building.Type)) update = true;
+            switch (acc.AccInfo.ServerVersion)
+            {
+                case ServerVersionEnum.T4_5:
+                    await UrlHelper.BuildNavigate(acc, acc.Wb.Html, building.Id);
+                    break;
+                case ServerVersionEnum.TTwars:
+                    break;
+            }
             // If we are already at the desired building (if gid is correct)
             Uri currentUri = new Uri(acc.Wb.CurrentUrl);
             if (HttpUtility.ParseQueryString(currentUri.Query).Get("gid") == ((int)building.Type).ToString() && !update)
diff --git a/TbsCore/TravianData/BuildingsData.cs b/TbsCore/TravianData/BuildingsData.cs
@@ -73,7 +73,7 @@ public static int MaxBuildingLevel(Account acc, BuildingEnum building)
                 case BuildingEnum.Brewery:
                     switch (acc.AccInfo.ServerVersion)
                     {
-                        case ServerVersionEnum.T4_4: return 10;
+                        case ServerVersionEnum.TTwars: return 10;
                         default: return 20;
                     }
 
@@ -408,6 +408,24 @@ public static (TribeEnum, List<Prerequisite>) GetBuildingPrerequisites(BuildingE
             return (tribe, ret);
         }
 
+        /// <summary>
+        /// Whether building has multiple tabs inside
+        /// </summary>
+        public static bool HasMultipleTabs(BuildingEnum building) =>
+            multipleTabsBuildings.Any(x => x == building);
+
+        /// <summary>
+        /// Buildings with multiple tabs inside
+        /// </summary>
+        private static BuildingEnum[] multipleTabsBuildings = new BuildingEnum[] {
+            BuildingEnum.RallyPoint,
+            BuildingEnum.CommandCenter,
+            BuildingEnum.Residence,
+            BuildingEnum.Palace,
+            BuildingEnum.Marketplace,
+            BuildingEnum.Treasury,
+        };
+
         /// <summary>
         /// Buildings that are always build in the same spot
         /// </summary>
