Service improve (#198)

vinaghost · web-flow · commit 3efefc830f94 · 2022-11-23T10:12:22.000+07:00
diff --git a/MainCore/Helper/BuildingsHelper.cs b/MainCore/Helper/BuildingsHelper.cs
@@ -1,6 +1,6 @@
 ﻿using MainCore.Enums;
 using MainCore.Models.Runtime;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/MainCore/Helper/CheckHelper.cs b/MainCore/Helper/CheckHelper.cs
@@ -1,7 +1,7 @@
 ﻿using HtmlAgilityPack;
 using MainCore.Enums;
-using MainCore.Services;
 using System.Linq;
+using MainCore.Services.Interface;
 
 #if TRAVIAN_OFFICIAL
 
diff --git a/MainCore/Helper/ClickHelper.cs b/MainCore/Helper/ClickHelper.cs
@@ -1,5 +1,5 @@
 ﻿using HtmlAgilityPack;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using OpenQA.Selenium;
 using System;
 
diff --git a/MainCore/Helper/HeroHelper.cs b/MainCore/Helper/HeroHelper.cs
@@ -1,6 +1,6 @@
 ﻿using HtmlAgilityPack;
 using MainCore.Enums;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using OpenQA.Selenium;
 using System;
 
diff --git a/MainCore/Helper/NavigateHelper.cs b/MainCore/Helper/NavigateHelper.cs
@@ -1,9 +1,9 @@
-﻿using MainCore.Services;
-using System;
+﻿using System;
 using OpenQA.Selenium;
 using MainCore.Exceptions;
 using System.Threading;
 using System.Collections.ObjectModel;
+using MainCore.Services.Interface;
 
 #if TRAVIAN_OFFICIAL
 
diff --git a/MainCore/Helper/UpdateHelper.cs b/MainCore/Helper/UpdateHelper.cs
@@ -1,6 +1,6 @@
 ﻿using MainCore.Enums;
 using MainCore.Models.Database;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/MainCore/Helper/UpgradeBuildingHelper.cs b/MainCore/Helper/UpgradeBuildingHelper.cs
@@ -1,7 +1,7 @@
 ﻿using MainCore.Enums;
 using MainCore.Models.Database;
 using MainCore.Models.Runtime;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/MainCore/Services/Implementations/ChromeBrowser.cs b/MainCore/Services/Implementations/ChromeBrowser.cs
@@ -1,13 +1,14 @@
 ﻿using HtmlAgilityPack;
 using MainCore.Models.Database;
+using MainCore.Services.Interface;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Chrome.ChromeDriverExtensions;
 using OpenQA.Selenium.Support.UI;
 using System;
 using System.IO;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class ChromeBrowser : IChromeBrowser
     {
diff --git a/MainCore/Services/Implementations/ChromeDriverInstaller.cs b/MainCore/Services/Implementations/ChromeDriverInstaller.cs
@@ -8,7 +8,7 @@
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public static class ChromeDriverInstaller
     {
diff --git a/MainCore/Services/Implementations/ChromeManager.cs b/MainCore/Services/Implementations/ChromeManager.cs
@@ -3,8 +3,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using MainCore.Services.Interface;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class ChromeManager : IChromeManager
     {
diff --git a/MainCore/Services/Implementations/EventManager.cs b/MainCore/Services/Implementations/EventManager.cs
@@ -1,7 +1,7 @@
 ﻿using MainCore.Models.Runtime;
 using System;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class EventManager
     {
diff --git a/MainCore/Services/Implementations/LogManager.cs b/MainCore/Services/Implementations/LogManager.cs
@@ -1,11 +1,12 @@
 ﻿using MainCore.Enums;
 using MainCore.Models.Runtime;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
 using System;
 using System.Collections.Generic;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class LogManager : ILogManager
     {
diff --git a/MainCore/Services/Implementations/PlanManager.cs b/MainCore/Services/Implementations/PlanManager.cs
@@ -1,11 +1,12 @@
 ﻿using MainCore.Helper;
 using MainCore.Models.Runtime;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class PlanManager : IPlanManager
     {
diff --git a/MainCore/Services/Implementations/RestClientManager.cs b/MainCore/Services/Implementations/RestClientManager.cs
@@ -1,4 +1,5 @@
 ﻿using MainCore.Models.Runtime;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using RestSharp;
 using System;
@@ -7,7 +8,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class RestClientManager : IRestClientManager
     {
diff --git a/MainCore/Services/Implementations/TaskManager.cs b/MainCore/Services/Implementations/TaskManager.cs
@@ -2,6 +2,7 @@
 using MainCore.Exceptions;
 using MainCore.Helper;
 using MainCore.Models.Database;
+using MainCore.Services.Interface;
 using MainCore.Tasks;
 using MainCore.Tasks.Misc;
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +11,7 @@
 using System.Linq;
 using System.Threading;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class TaskManager : ITaskManager
     {
diff --git a/MainCore/Services/Implementations/TimerManager.cs b/MainCore/Services/Implementations/TimerManager.cs
@@ -1,7 +1,8 @@
 ﻿using System.Collections.Generic;
 using System.Timers;
+using MainCore.Services.Interface;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class TimerManager : ITimerManager
     {
@@ -23,7 +24,7 @@ public void Start(int index)
             if (!_dictTimer.ContainsKey(index))
             {
                 var timer = new Timer(100) { AutoReset = false };
-                timer.Elapsed += (object sender, ElapsedEventArgs e) =>
+                timer.Elapsed += (sender, e) =>
                 {
                     try
                     {
diff --git a/MainCore/Services/Implementations/UseragentManager.cs b/MainCore/Services/Implementations/UseragentManager.cs
@@ -1,11 +1,12 @@
-﻿using RestSharp;
+﻿using MainCore.Services.Interface;
+using RestSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace MainCore.Services
+namespace MainCore.Services.Implementations
 {
     public sealed class UseragentManager : IUseragentManager
     {
diff --git a/MainCore/Services/Interface/IChromeBrowser.cs b/MainCore/Services/Interface/IChromeBrowser.cs
@@ -3,7 +3,7 @@
 using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Support.UI;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IChromeBrowser
     {
diff --git a/MainCore/Services/Interface/IChromeManager.cs b/MainCore/Services/Interface/IChromeManager.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IChromeManager : IDisposable
     {
diff --git a/MainCore/Services/Interface/ILogManager.cs b/MainCore/Services/Interface/ILogManager.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface ILogManager : IDisposable
     {
diff --git a/MainCore/Services/Interface/IPlanManager.cs b/MainCore/Services/Interface/IPlanManager.cs
@@ -1,7 +1,7 @@
 ﻿using MainCore.Models.Runtime;
 using System.Collections.Generic;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IPlanManager
     {
diff --git a/MainCore/Services/Interface/IRestClientManager.cs b/MainCore/Services/Interface/IRestClientManager.cs
@@ -2,7 +2,7 @@
 using RestSharp;
 using System;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IRestClientManager : IDisposable
     {
diff --git a/MainCore/Services/Interface/ITaskManager.cs b/MainCore/Services/Interface/ITaskManager.cs
@@ -2,7 +2,7 @@
 using MainCore.Tasks;
 using System.Collections.Generic;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface ITaskManager
     {
diff --git a/MainCore/Services/Interface/ITimerManager.cs b/MainCore/Services/Interface/ITimerManager.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface ITimerManager : IDisposable
     {
diff --git a/MainCore/Services/Interface/IUseragentManager.cs b/MainCore/Services/Interface/IUseragentManager.cs
@@ -1,6 +1,6 @@
 ﻿using System.Threading.Tasks;
 
-namespace MainCore.Services
+namespace MainCore.Services.Interface
 {
     public interface IUseragentManager
     {
diff --git a/MainCore/Tasks/Attack/StartFarmList.cs b/MainCore/Tasks/Attack/StartFarmList.cs
@@ -1,5 +1,6 @@
 using MainCore.Helper;
-using MainCore.Services;
+using MainCore.Services.Implementations;
+using MainCore.Services.Interface;
 using MainCore.Tasks.Update;
 using Microsoft.EntityFrameworkCore;
 using OpenQA.Selenium;
diff --git a/MainCore/Tasks/BotTask.cs b/MainCore/Tasks/BotTask.cs
@@ -1,5 +1,6 @@
 ﻿using MainCore.Enums;
-using MainCore.Services;
+using MainCore.Services.Implementations;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Threading;
diff --git a/MainCore/Tasks/VillageBotTask.cs b/MainCore/Tasks/VillageBotTask.cs
@@ -1,4 +1,5 @@
-﻿using MainCore.Services;
+﻿using MainCore.Services.Implementations;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 
 namespace MainCore.Tasks
diff --git a/WPFUI/App.xaml.cs b/WPFUI/App.xaml.cs
@@ -1,15 +1,16 @@
 ﻿using FluentMigrator.Runner;
 using MainCore;
 using MainCore.Migrations;
-using MainCore.Services;
+using MainCore.Services.Implementations;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
 using WPFUI.Views;
-using EventManager = MainCore.Services.EventManager;
+using EventManager = MainCore.Services.Implementations.EventManager;
 
 namespace WPFUI
 {
diff --git a/WPFUI/ViewModels/Abstract/TabBaseViewModel.cs b/WPFUI/ViewModels/Abstract/TabBaseViewModel.cs
@@ -1,5 +1,6 @@
 ﻿using MainCore;
-using MainCore.Services;
+using MainCore.Services.Implementations;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using ReactiveUI;
 using WPFUI.Views;
diff --git a/WPFUI/ViewModels/MainWindowViewModel.cs b/WPFUI/ViewModels/MainWindowViewModel.cs
@@ -1,7 +1,8 @@
 ﻿using MainCore;
 using MainCore.Enums;
 using MainCore.Models.Database;
-using MainCore.Services;
+using MainCore.Services.Implementations;
+using MainCore.Services.Interface;
 using Microsoft.EntityFrameworkCore;
 using ReactiveUI;
 using System;
diff --git a/WPFUI/ViewModels/Uc/ButtonPanelViewModel.cs b/WPFUI/ViewModels/Uc/ButtonPanelViewModel.cs
@@ -2,7 +2,7 @@
 using MainCore.Enums;
 using MainCore.Helper;
 using MainCore.Models.Database;
-using MainCore.Services;
+using MainCore.Services.Interface;
 using MainCore.Tasks.Misc;
 using Microsoft.EntityFrameworkCore;
 using ReactiveUI;
@@ -16,7 +16,7 @@
 using WPFUI.Models;
 using WPFUI.Views;
 using Access = MainCore.Models.Database.Access;
-using EventManager = MainCore.Services.EventManager;
+using EventManager = MainCore.Services.Implementations.EventManager;
 
 namespace WPFUI.ViewModels.Uc
 {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using System.Runtime.InteropServices;`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`
`11`		`-namespace MainCore.Services`
	`11`	`+namespace MainCore.Services.Implementations`
`12`	`12`	`{`
`13`	`13`	`public static class ChromeDriverInstaller`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.IO;`
`5`	`5`	`using System.Reflection;`
	`6`	`+using MainCore.Services.Interface;`
`6`	`7`
`7`		`-namespace MainCore.Services`
	`8`	`+namespace MainCore.Services.Implementations`
`8`	`9`	`{`
`9`	`10`	`public sealed class ChromeManager : IChromeManager`
`10`	`11`	`{`