Missing refresh village tickbox (#171)

vinaghost · web-flow · commit bcecae56eb59 · 2022-10-22T17:03:11.000+07:00
diff --git a/MainCore/Tasks/Attack/StartFarmList.cs b/MainCore/Tasks/Attack/StartFarmList.cs
@@ -1,9 +1,9 @@
 using MainCore.Services;
-using MainCore.Tasks.Update;
 using Microsoft.EntityFrameworkCore;
 using OpenQA.Selenium;
 using System;
 using System.Linq;
+using MainCore.Tasks.Update;
 
 #if TRAVIAN_OFFICIAL || TRAVIAN_OFFICIAL_HEROUI
 
@@ -21,7 +21,7 @@
 
 namespace MainCore.Tasks.Attack
 {
-    public class StartFarmList : UpdateFarmList
+    public class StartFarmList : AccountBotTask
     {
         public StartFarmList(int accountId, int farmId) : base(accountId, "Start farmlist")
         {
@@ -58,7 +58,10 @@ public override void SetService(IDbContextFactory<AppDbContext> contextFactory,
 
         public override void Execute()
         {
-            base.Execute();
+            if (!IsUpdateFail())
+            {
+                return;
+            }
 
             if (!IsFarmExist())
             {
@@ -84,6 +87,14 @@ public override void Execute()
             }
         }
 
+        private bool IsUpdateFail()
+        {
+            var updateTask = new UpdateFarmList(AccountId);
+            updateTask.CopyFrom(this);
+            updateTask.Execute();
+            return updateTask.IsFail;
+        }
+
         private bool IsFarmExist()
         {
             using var context = _contextFactory.CreateDbContext();
diff --git a/MainCore/Tasks/BotTask.cs b/MainCore/Tasks/BotTask.cs
@@ -12,7 +12,7 @@ public abstract class BotTask
         public DateTime ExecuteAt { get; set; }
         public int RetryCounter { get; set; }
         protected bool StopFlag { get; set; }
-        public bool IsFail { get; set; }
+        public bool IsFail { get; protected set; }
         public CancellationTokenSource Cts { get; set; }
 
         protected IDbContextFactory<AppDbContext> _contextFactory;
diff --git a/MainCore/Tasks/Misc/LoginTask.cs b/MainCore/Tasks/Misc/LoginTask.cs
@@ -165,7 +165,7 @@ private void AddTask()
                     var update = updateList.FirstOrDefault(x => x.VillageId == village.Id);
                     if (update is null)
                     {
-                        _taskManager.Add(AccountId, new UpdateDorf1(village.Id, AccountId));
+                        _taskManager.Add(AccountId, new RefreshVillage(village.Id, AccountId));
                     }
                 }
             }
diff --git a/MainCore/Tasks/Misc/RefreshVillage.cs b/MainCore/Tasks/Misc/RefreshVillage.cs
@@ -24,6 +24,7 @@ public override void Execute()
             }
             taskUpdate.CopyFrom(this);
             taskUpdate.Execute();
+            if (taskUpdate.IsFail) return;
 
             NextExecute();
         }
diff --git a/MainCore/Tasks/Update/UpdateAdventures.cs b/MainCore/Tasks/Update/UpdateAdventures.cs
@@ -13,6 +13,7 @@ public UpdateAdventures(int accountId) : base(accountId, "Update hero's adventur
 
         public override void Execute()
         {
+            IsFail = true;
             using var context = _contextFactory.CreateDbContext();
 
             NavigateHelper.ToAdventure(_chromeBrowser);
@@ -42,6 +43,7 @@ public override void Execute()
                     NextExecute();
                 }
             }
+            IsFail = false;
         }
 
         private void NextExecute()
diff --git a/MainCore/Tasks/Update/UpdateBothDorf.cs b/MainCore/Tasks/Update/UpdateBothDorf.cs
@@ -3,42 +3,43 @@
 
 namespace MainCore.Tasks.Update
 {
-    public class UpdateBothDorf : UpdateVillage
+    public class UpdateBothDorf : VillageBotTask
     {
         public UpdateBothDorf(int villageId, int accountId) : base(villageId, accountId, "Update All page")
         {
         }
 
         public override void Execute()
         {
+            IsFail = true;
             var url = _chromeBrowser.GetCurrentUrl();
             if (url.Contains("dorf2"))
             {
                 {
                     using var context = _contextFactory.CreateDbContext();
                     NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);
                 }
-                base.Execute();
+                if (IsUpdateFail()) return;
 
                 {
                     using var context = _contextFactory.CreateDbContext();
                     NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);
                 }
-                base.Execute();
+                if (IsUpdateFail()) return;
             }
             else if (url.Contains("dorf1"))
             {
                 {
                     using var context = _contextFactory.CreateDbContext();
                     NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);
                 }
-                base.Execute();
+                if (IsUpdateFail()) return;
 
                 {
                     using var context = _contextFactory.CreateDbContext();
                     NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);
                 }
-                base.Execute();
+                if (IsUpdateFail()) return;
             }
             else
             {
@@ -49,29 +50,38 @@ public override void Execute()
                         using var context = _contextFactory.CreateDbContext();
                         NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);
                     }
-                    base.Execute();
+                    if (IsUpdateFail()) return;
 
                     {
                         using var context = _contextFactory.CreateDbContext();
                         NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);
                     }
-                    base.Execute();
+                    if (IsUpdateFail()) return;
                 }
                 else
                 {
                     {
                         using var context = _contextFactory.CreateDbContext();
                         NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);
                     }
-                    base.Execute();
+                    if (IsUpdateFail()) return;
 
                     {
                         using var context = _contextFactory.CreateDbContext();
                         NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);
                     }
-                    base.Execute();
+                    if (IsUpdateFail()) return;
                 }
             }
+            IsFail = false;
+        }
+
+        private bool IsUpdateFail()
+        {
+            var taskUpdate = new UpdateVillage(VillageId, AccountId);
+            taskUpdate.CopyFrom(this);
+            taskUpdate.Execute();
+            return taskUpdate.IsFail;
         }
     }
 }
diff --git a/MainCore/Tasks/Update/UpdateDorf1.cs b/MainCore/Tasks/Update/UpdateDorf1.cs
@@ -2,22 +2,32 @@
 
 namespace MainCore.Tasks.Update
 {
-    public class UpdateDorf1 : UpdateVillage
+    public class UpdateDorf1 : VillageBotTask
     {
         public UpdateDorf1(int villageId, int accountId) : base(villageId, accountId, "Update Resources page")
         {
         }
 
         public override void Execute()
         {
+            IsFail = true;
             ToDorf1();
-            base.Execute();
+            if (IsUpdateFail()) return;
+            IsFail = false;
         }
 
         private void ToDorf1()
         {
             using var context = _contextFactory.CreateDbContext();
             NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);
         }
+
+        private bool IsUpdateFail()
+        {
+            var taskUpdate = new UpdateVillage(VillageId, AccountId);
+            taskUpdate.CopyFrom(this);
+            taskUpdate.Execute();
+            return taskUpdate.IsFail;
+        }
     }
 }
diff --git a/MainCore/Tasks/Update/UpdateDorf2.cs b/MainCore/Tasks/Update/UpdateDorf2.cs
@@ -2,19 +2,32 @@
 
 namespace MainCore.Tasks.Update
 {
-    public class UpdateDorf2 : UpdateVillage
+    public class UpdateDorf2 : VillageBotTask
     {
         public UpdateDorf2(int villageId, int accountId) : base(villageId, accountId, "Update Buildings page")
         {
         }
 
         public override void Execute()
         {
-            {
-                using var context = _contextFactory.CreateDbContext();
-                NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);
-            }
-            base.Execute();
+            IsFail = true;
+            ToDorf2();
+            if (IsUpdateFail()) return;
+            IsFail = false;
+        }
+
+        private void ToDorf2()
+        {
+            using var context = _contextFactory.CreateDbContext();
+            NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);
+        }
+
+        private bool IsUpdateFail()
+        {
+            var taskUpdate = new UpdateVillage(VillageId, AccountId);
+            taskUpdate.CopyFrom(this);
+            taskUpdate.Execute();
+            return taskUpdate.IsFail;
         }
     }
 }
diff --git a/MainCore/Tasks/Update/UpdateFarmList.cs b/MainCore/Tasks/Update/UpdateFarmList.cs
@@ -10,29 +10,27 @@ public UpdateFarmList(int accountId) : base(accountId, "Update farmlist")
         {
         }
 
-        public UpdateFarmList(int accountId, string name) : base(accountId, name)
-        {
-        }
-
         public override void Execute()
         {
+            IsFail = true;
             var village = GetVillageHasRallyPoint();
-            if (Cts.IsCancellationRequested) return;
+            if (IsStop()) return;
             if (village == -1)
             {
                 _logManager.Warning(AccountId, "There is no rallypoint in your villages");
                 return;
             }
             {
                 var result = GotoFarmListPage(village);
-                if (Cts.IsCancellationRequested) return;
+                if (IsStop()) return;
                 if (!result) return;
             }
             {
                 using var context = _contextFactory.CreateDbContext();
                 UpdateHelper.UpdateFarmList(context, _chromeBrowser, AccountId);
                 _eventManager.OnFarmListUpdated(AccountId);
             }
+            IsFail = false;
         }
 
         private int GetVillageHasRallyPoint()
@@ -72,6 +70,7 @@ private bool GotoFarmListPage(int village)
                 var taskUpdate = new UpdateDorf2(village, AccountId);
                 taskUpdate.CopyFrom(this);
                 taskUpdate.Execute();
+                if (taskUpdate.IsFail) return false;
 
                 if (Cts.IsCancellationRequested) return false;
 
diff --git a/MainCore/Tasks/Update/UpdateHeroItems.cs b/MainCore/Tasks/Update/UpdateHeroItems.cs
@@ -10,9 +10,11 @@ public UpdateHeroItems(int accountId) : base(accountId, "Update hero's items")
 
         public override void Execute()
         {
+            IsFail = true;
             NavigateHelper.ToHeroInventory(_chromeBrowser);
             using var context = _contextFactory.CreateDbContext();
             UpdateHelper.UpdateHeroInventory(context, _chromeBrowser, AccountId);
+            IsFail = false;
         }
     }
 }
diff --git a/MainCore/Tasks/Update/UpdateInfo.cs b/MainCore/Tasks/Update/UpdateInfo.cs
@@ -32,9 +32,11 @@ public UpdateInfo(int accountId) : base(accountId, "Update info")
 
         public override void Execute()
         {
+            IsFail = true;
             UpdateAccountInfo();
             UpdateVillageList();
             UpdateHeroInfo();
+            IsFail = false;
         }
 
         private void UpdateVillageList()
diff --git a/MainCore/Tasks/Update/UpdateVillage.cs b/MainCore/Tasks/Update/UpdateVillage.cs
@@ -13,15 +13,13 @@ public UpdateVillage(int villageId, int accountId) : base(villageId, accountId,
         {
         }
 
-        public UpdateVillage(int villageId, int accountId, string name) : base(villageId, accountId, name)
-        {
-        }
-
         public override void Execute()
         {
+            IsFail = true;
             Navigate();
-            UpdateAccountInfo();
+            if (IsUpdateAccountInfoFail()) return;
             UpdateVillageInfo();
+            IsFail = false;
         }
 
         private void Navigate()
@@ -30,11 +28,12 @@ private void Navigate()
             NavigateHelper.SwitchVillage(context, _chromeBrowser, VillageId, AccountId);
         }
 
-        private void UpdateAccountInfo()
+        private bool IsUpdateAccountInfoFail()
         {
             var updateTask = new UpdateInfo(AccountId);
             updateTask.CopyFrom(this);
             updateTask.Execute();
+            return updateTask.IsFail;
         }
 
         private void UpdateVillageInfo()
diff --git a/WPFUI/ViewModels/Tabs/Villages/SettingsViewModel.cs b/WPFUI/ViewModels/Tabs/Villages/SettingsViewModel.cs
@@ -1,7 +1,7 @@
 ﻿using MainCore.Enums;
 using MainCore.Helper;
+using MainCore.Tasks.Misc;
 using MainCore.Tasks.Sim;
-using MainCore.Tasks.Update;
 using Microsoft.Win32;
 using ReactiveUI;
 using System;
@@ -170,12 +170,12 @@ private void TaskBasedSetting(int villageId, int accountId)
                 }
             }
             {
-                var tasks = list.OfType<UpdateDorf1>();
+                var tasks = list.OfType<RefreshVillage>();
                 if (Settings.IsAutoRefresh)
                 {
                     if (!tasks.Any(x => x.VillageId == villageId))
                     {
-                        _taskManager.Add(accountId, new UpdateDorf1(villageId, accountId));
+                        _taskManager.Add(accountId, new RefreshVillage(villageId, accountId));
                     }
                 }
                 else
diff --git a/WPFUI/Views/Tabs/Villages/SettingsPage.xaml b/WPFUI/Views/Tabs/Villages/SettingsPage.xaml
diff --git a/WPFUI/Views/Tabs/Villages/SettingsPage.xaml.cs b/WPFUI/Views/Tabs/Villages/SettingsPage.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`using MainCore.Services;`
`2`		`-using MainCore.Tasks.Update;`
`3`	`2`	`using Microsoft.EntityFrameworkCore;`
`4`	`3`	`using OpenQA.Selenium;`
`5`	`4`	`using System;`
`6`	`5`	`using System.Linq;`
	`6`	`+using MainCore.Tasks.Update;`
`7`	`7`
`8`	`8`	`#if TRAVIAN_OFFICIAL \|\| TRAVIAN_OFFICIAL_HEROUI`
`9`	`9`
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`namespace MainCore.Tasks.Attack`
`23`	`23`	`{`
`24`		`- public class StartFarmList : UpdateFarmList`
	`24`	`+ public class StartFarmList : AccountBotTask`
`25`	`25`	`{`
`26`	`26`	`public StartFarmList(int accountId, int farmId) : base(accountId, "Start farmlist")`
`27`	`27`	`{`
`@@ -58,7 +58,10 @@ public override void SetService(IDbContextFactory<AppDbContext> contextFactory,`
`58`	`58`
`59`	`59`	`public override void Execute()`
`60`	`60`	`{`
`61`		`- base.Execute();`
	`61`	`+ if (!IsUpdateFail())`
	`62`	`+ {`
	`63`	`+ return;`
	`64`	`+ }`
`62`	`65`
`63`	`66`	`if (!IsFarmExist())`
`64`	`67`	`{`
`@@ -84,6 +87,14 @@ public override void Execute()`
`84`	`87`	`}`
`85`	`88`	`}`
`86`	`89`
	`90`	`+ private bool IsUpdateFail()`
	`91`	`+ {`
	`92`	`+ var updateTask = new UpdateFarmList(AccountId);`
	`93`	`+ updateTask.CopyFrom(this);`
	`94`	`+ updateTask.Execute();`
	`95`	`+ return updateTask.IsFail;`
	`96`	`+ }`
	`97`	`+`
`87`	`98`	`private bool IsFarmExist()`
`88`	`99`	`{`
`89`	`100`	`using var context = _contextFactory.CreateDbContext();`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ private void AddTask()`
`165`	`165`	`var update = updateList.FirstOrDefault(x => x.VillageId == village.Id);`
`166`	`166`	`if (update is null)`
`167`	`167`	`{`
`168`		`- _taskManager.Add(AccountId, new UpdateDorf1(village.Id, AccountId));`
	`168`	`+ _taskManager.Add(AccountId, new RefreshVillage(village.Id, AccountId));`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public override void Execute()`
`24`	`24`	`}`
`25`	`25`	`taskUpdate.CopyFrom(this);`
`26`	`26`	`taskUpdate.Execute();`
	`27`	`+ if (taskUpdate.IsFail) return;`
`27`	`28`
`28`	`29`	`NextExecute();`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public UpdateAdventures(int accountId) : base(accountId, "Update hero's adventur`
`13`	`13`
`14`	`14`	`public override void Execute()`
`15`	`15`	`{`
	`16`	`+ IsFail = true;`
`16`	`17`	`using var context = _contextFactory.CreateDbContext();`
`17`	`18`
`18`	`19`	`NavigateHelper.ToAdventure(_chromeBrowser);`
`@@ -42,6 +43,7 @@ public override void Execute()`
`42`	`43`	`NextExecute();`
`43`	`44`	`}`
`44`	`45`	`}`
	`46`	`+ IsFail = false;`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`private void NextExecute()`
Original file line number	Diff line number	Diff line change
`@@ -3,42 +3,43 @@`
`3`	`3`
`4`	`4`	`namespace MainCore.Tasks.Update`
`5`	`5`	`{`
`6`		`- public class UpdateBothDorf : UpdateVillage`
	`6`	`+ public class UpdateBothDorf : VillageBotTask`
`7`	`7`	`{`
`8`	`8`	`public UpdateBothDorf(int villageId, int accountId) : base(villageId, accountId, "Update All page")`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public override void Execute()`
`13`	`13`	`{`
	`14`	`+ IsFail = true;`
`14`	`15`	`var url = _chromeBrowser.GetCurrentUrl();`
`15`	`16`	`if (url.Contains("dorf2"))`
`16`	`17`	`{`
`17`	`18`	`{`
`18`	`19`	`using var context = _contextFactory.CreateDbContext();`
`19`	`20`	`NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);`
`20`	`21`	`}`
`21`		`- base.Execute();`
	`22`	`+ if (IsUpdateFail()) return;`
`22`	`23`
`23`	`24`	`{`
`24`	`25`	`using var context = _contextFactory.CreateDbContext();`
`25`	`26`	`NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);`
`26`	`27`	`}`
`27`		`- base.Execute();`
	`28`	`+ if (IsUpdateFail()) return;`
`28`	`29`	`}`
`29`	`30`	`else if (url.Contains("dorf1"))`
`30`	`31`	`{`
`31`	`32`	`{`
`32`	`33`	`using var context = _contextFactory.CreateDbContext();`
`33`	`34`	`NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);`
`34`	`35`	`}`
`35`		`- base.Execute();`
	`36`	`+ if (IsUpdateFail()) return;`
`36`	`37`
`37`	`38`	`{`
`38`	`39`	`using var context = _contextFactory.CreateDbContext();`
`39`	`40`	`NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);`
`40`	`41`	`}`
`41`		`- base.Execute();`
	`42`	`+ if (IsUpdateFail()) return;`
`42`	`43`	`}`
`43`	`44`	`else`
`44`	`45`	`{`
`@@ -49,29 +50,38 @@ public override void Execute()`
`49`	`50`	`using var context = _contextFactory.CreateDbContext();`
`50`	`51`	`NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);`
`51`	`52`	`}`
`52`		`- base.Execute();`
	`53`	`+ if (IsUpdateFail()) return;`
`53`	`54`
`54`	`55`	`{`
`55`	`56`	`using var context = _contextFactory.CreateDbContext();`
`56`	`57`	`NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);`
`57`	`58`	`}`
`58`		`- base.Execute();`
	`59`	`+ if (IsUpdateFail()) return;`
`59`	`60`	`}`
`60`	`61`	`else`
`61`	`62`	`{`
`62`	`63`	`{`
`63`	`64`	`using var context = _contextFactory.CreateDbContext();`
`64`	`65`	`NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);`
`65`	`66`	`}`
`66`		`- base.Execute();`
	`67`	`+ if (IsUpdateFail()) return;`
`67`	`68`
`68`	`69`	`{`
`69`	`70`	`using var context = _contextFactory.CreateDbContext();`
`70`	`71`	`NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);`
`71`	`72`	`}`
`72`		`- base.Execute();`
	`73`	`+ if (IsUpdateFail()) return;`
`73`	`74`	`}`
`74`	`75`	`}`
	`76`	`+ IsFail = false;`
	`77`	`+ }`
	`78`	`+`
	`79`	`+ private bool IsUpdateFail()`
	`80`	`+ {`
	`81`	`+ var taskUpdate = new UpdateVillage(VillageId, AccountId);`
	`82`	`+ taskUpdate.CopyFrom(this);`
	`83`	`+ taskUpdate.Execute();`
	`84`	`+ return taskUpdate.IsFail;`
`75`	`85`	`}`
`76`	`86`	`}`
`77`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,22 +2,32 @@`
`2`	`2`
`3`	`3`	`namespace MainCore.Tasks.Update`
`4`	`4`	`{`
`5`		`- public class UpdateDorf1 : UpdateVillage`
	`5`	`+ public class UpdateDorf1 : VillageBotTask`
`6`	`6`	`{`
`7`	`7`	`public UpdateDorf1(int villageId, int accountId) : base(villageId, accountId, "Update Resources page")`
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public override void Execute()`
`12`	`12`	`{`
	`13`	`+ IsFail = true;`
`13`	`14`	`ToDorf1();`
`14`		`- base.Execute();`
	`15`	`+ if (IsUpdateFail()) return;`
	`16`	`+ IsFail = false;`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`private void ToDorf1()`
`18`	`20`	`{`
`19`	`21`	`using var context = _contextFactory.CreateDbContext();`
`20`	`22`	`NavigateHelper.ToDorf1(_chromeBrowser, context, AccountId);`
`21`	`23`	`}`
	`24`	`+`
	`25`	`+ private bool IsUpdateFail()`
	`26`	`+ {`
	`27`	`+ var taskUpdate = new UpdateVillage(VillageId, AccountId);`
	`28`	`+ taskUpdate.CopyFrom(this);`
	`29`	`+ taskUpdate.Execute();`
	`30`	`+ return taskUpdate.IsFail;`
	`31`	`+ }`
`22`	`32`	`}`
`23`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,19 +2,32 @@`
`2`	`2`
`3`	`3`	`namespace MainCore.Tasks.Update`
`4`	`4`	`{`
`5`		`- public class UpdateDorf2 : UpdateVillage`
	`5`	`+ public class UpdateDorf2 : VillageBotTask`
`6`	`6`	`{`
`7`	`7`	`public UpdateDorf2(int villageId, int accountId) : base(villageId, accountId, "Update Buildings page")`
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public override void Execute()`
`12`	`12`	`{`
`13`		`- {`
`14`		`- using var context = _contextFactory.CreateDbContext();`
`15`		`- NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);`
`16`		`- }`
`17`		`- base.Execute();`
	`13`	`+ IsFail = true;`
	`14`	`+ ToDorf2();`
	`15`	`+ if (IsUpdateFail()) return;`
	`16`	`+ IsFail = false;`
	`17`	`+ }`
	`18`	`+`
	`19`	`+ private void ToDorf2()`
	`20`	`+ {`
	`21`	`+ using var context = _contextFactory.CreateDbContext();`
	`22`	`+ NavigateHelper.ToDorf2(_chromeBrowser, context, AccountId);`
	`23`	`+ }`
	`24`	`+`
	`25`	`+ private bool IsUpdateFail()`
	`26`	`+ {`
	`27`	`+ var taskUpdate = new UpdateVillage(VillageId, AccountId);`
	`28`	`+ taskUpdate.CopyFrom(this);`
	`29`	`+ taskUpdate.Execute();`
	`30`	`+ return taskUpdate.IsFail;`
`18`	`31`	`}`
`19`	`32`	`}`
`20`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,29 +10,27 @@ public UpdateFarmList(int accountId) : base(accountId, "Update farmlist")`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`13`		`- public UpdateFarmList(int accountId, string name) : base(accountId, name)`
`14`		`- {`
`15`		`- }`
`16`		`-`
`17`	`13`	`public override void Execute()`
`18`	`14`	`{`
	`15`	`+ IsFail = true;`
`19`	`16`	`var village = GetVillageHasRallyPoint();`
`20`		`- if (Cts.IsCancellationRequested) return;`
	`17`	`+ if (IsStop()) return;`
`21`	`18`	`if (village == -1)`
`22`	`19`	`{`
`23`	`20`	`_logManager.Warning(AccountId, "There is no rallypoint in your villages");`
`24`	`21`	`return;`
`25`	`22`	`}`
`26`	`23`	`{`
`27`	`24`	`var result = GotoFarmListPage(village);`
`28`		`- if (Cts.IsCancellationRequested) return;`
	`25`	`+ if (IsStop()) return;`
`29`	`26`	`if (!result) return;`
`30`	`27`	`}`
`31`	`28`	`{`
`32`	`29`	`using var context = _contextFactory.CreateDbContext();`
`33`	`30`	`UpdateHelper.UpdateFarmList(context, _chromeBrowser, AccountId);`
`34`	`31`	`_eventManager.OnFarmListUpdated(AccountId);`
`35`	`32`	`}`
	`33`	`+ IsFail = false;`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`private int GetVillageHasRallyPoint()`
`@@ -72,6 +70,7 @@ private bool GotoFarmListPage(int village)`
`72`	`70`	`var taskUpdate = new UpdateDorf2(village, AccountId);`
`73`	`71`	`taskUpdate.CopyFrom(this);`
`74`	`72`	`taskUpdate.Execute();`
	`73`	`+ if (taskUpdate.IsFail) return false;`
`75`	`74`
`76`	`75`	`if (Cts.IsCancellationRequested) return false;`
`77`	`76`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,11 @@ public UpdateHeroItems(int accountId) : base(accountId, "Update hero's items")`
`10`	`10`
`11`	`11`	`public override void Execute()`
`12`	`12`	`{`
	`13`	`+ IsFail = true;`
`13`	`14`	`NavigateHelper.ToHeroInventory(_chromeBrowser);`
`14`	`15`	`using var context = _contextFactory.CreateDbContext();`
`15`	`16`	`UpdateHelper.UpdateHeroInventory(context, _chromeBrowser, AccountId);`
	`17`	`+ IsFail = false;`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`	`}`