From 712cfdfdf020e449b598c322f49fdb0a86a4a498 Mon Sep 17 00:00:00 2001 From: Nicolas Schmitt Date: Tue, 2 Aug 2016 10:56:45 +0200 Subject: [PATCH] Refactor WebSocket Handler --- PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj | 42 +++++++++---------- .../EvolvePokemonHandler.cs | 6 +-- .../TransferPokemonHandler.cs | 6 +-- .../Tasks/EvolvePokemonTask.cs | 21 ---------- .../Tasks/TransferPokemonTask.cs | 21 ---------- .../WebSocketHandler/EncodingHelper.cs | 1 - .../Events/EggListResponce.cs | 2 +- .../Events/ItemListResponce.cs | 2 +- .../Events/PokemonListResponce.cs | 2 +- .../Events/TrainerProfileResponce.cs | 2 +- .../Events/WebResponce.cs | 2 +- .../GetEggListHandler.cs | 4 +- .../GetItemsListHandler.cs | 4 +- .../GetPokemonListHandler.cs | 4 +- .../GetPokemonSettingsHandler.cs | 4 +- .../GetTrainerProfileHandler.cs | 4 +- .../Helpers/EggListWeb.cs | 2 +- .../Helpers/PokemonListWeb.cs | 2 +- .../Helpers/TrainerProfileWeb.cs | 2 +- .../Tasks/GetEggListTask.cs | 6 +-- .../Tasks/GetItemListTask.cs | 4 +- .../Tasks/GetPokemonListTask.cs | 4 +- .../Tasks/GetPokemonSettingsTask.cs | 4 +- .../Tasks/GetTrainerProfileTask.cs | 6 +-- 24 files changed, 56 insertions(+), 101 deletions(-) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => ActionCommands}/EvolvePokemonHandler.cs (67%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => ActionCommands}/TransferPokemonHandler.cs (68%) delete mode 100644 PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/EvolvePokemonTask.cs delete mode 100644 PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/TransferPokemonTask.cs rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Events/EggListResponce.cs (88%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Events/ItemListResponce.cs (88%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Events/PokemonListResponce.cs (89%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Events/TrainerProfileResponce.cs (88%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Events/WebResponce.cs (82%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/GetEggListHandler.cs (82%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/GetItemsListHandler.cs (82%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/GetPokemonListHandler.cs (83%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/GetPokemonSettingsHandler.cs (83%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/GetTrainerProfileHandler.cs (83%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Helpers/EggListWeb.cs (78%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Helpers/PokemonListWeb.cs (89%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Helpers/TrainerProfileWeb.cs (86%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Tasks/GetEggListTask.cs (85%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Tasks/GetItemListTask.cs (80%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Tasks/GetPokemonListTask.cs (84%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Tasks/GetPokemonSettingsTask.cs (83%) rename PoGo.NecroBot.CLI/WebSocketHandler/{BasicGetCommands => GetCommands}/Tasks/GetTrainerProfileTask.cs (78%) diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj index 3fd17f648..bc5d5c7ed 100644 --- a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj +++ b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj @@ -110,31 +110,29 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/EvolvePokemonHandler.cs b/PoGo.NecroBot.CLI/WebSocketHandler/ActionCommands/EvolvePokemonHandler.cs similarity index 67% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/EvolvePokemonHandler.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/ActionCommands/EvolvePokemonHandler.cs index 589a22aaa..2a664b43a 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/EvolvePokemonHandler.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/ActionCommands/EvolvePokemonHandler.cs @@ -4,10 +4,10 @@ using System.Text; using System.Threading.Tasks; using SuperSocket.WebSocket; -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks; using PoGo.NecroBot.Logic.State; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands +namespace PoGo.NecroBot.CLI.WebSocketHandler.ActionCommands { public class EvolvePokemonHandler : IWebSocketRequestHandler { @@ -20,7 +20,7 @@ public EvolvePokemonHandler() public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await EvolvePokemonTask.Execute(session, webSocketSession, (ulong)message.PokemonId, (string)message.RequestID); + await Logic.Tasks.EvolveSpecificPokemonTask.Execute(session, (ulong)message.PokemonId); } } } \ No newline at end of file diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/TransferPokemonHandler.cs b/PoGo.NecroBot.CLI/WebSocketHandler/ActionCommands/TransferPokemonHandler.cs similarity index 68% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/TransferPokemonHandler.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/ActionCommands/TransferPokemonHandler.cs index c205abe92..9cad10f58 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/TransferPokemonHandler.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/ActionCommands/TransferPokemonHandler.cs @@ -4,10 +4,10 @@ using System.Text; using System.Threading.Tasks; using SuperSocket.WebSocket; -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks; using PoGo.NecroBot.Logic.State; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands +namespace PoGo.NecroBot.CLI.WebSocketHandler.ActionCommands { public class TransferPokemonHandler : IWebSocketRequestHandler { @@ -20,7 +20,7 @@ public TransferPokemonHandler() public async Task Handle(ISession session, WebSocketSession webSocketSession, dynamic message) { - await TransferPokemonTask.Execute(session, webSocketSession, (ulong)message.PokemonId, (string)message.RequestID); + await Logic.Tasks.TransferPokemonTask.Execute(session, (ulong)message.PokemonId); } } } diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/EvolvePokemonTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/EvolvePokemonTask.cs deleted file mode 100644 index 5f49ce7a4..000000000 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/EvolvePokemonTask.cs +++ /dev/null @@ -1,21 +0,0 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events; -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers; -using PoGo.NecroBot.Logic.State; -using POGOProtos.Inventory.Item; -using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks -{ - class EvolvePokemonTask - { - public static async Task Execute(ISession session, WebSocketSession webSocketSession, ulong pokemonId, string requestID) - { - await Logic.Tasks.EvolveSpecificPokemonTask.Execute(session, pokemonId); - } - } -} diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/TransferPokemonTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/TransferPokemonTask.cs deleted file mode 100644 index 3387dc0d9..000000000 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/TransferPokemonTask.cs +++ /dev/null @@ -1,21 +0,0 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events; -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers; -using PoGo.NecroBot.Logic.State; -using POGOProtos.Inventory.Item; -using SuperSocket.WebSocket; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks -{ - class TransferPokemonTask - { - public static async Task Execute(ISession session, WebSocketSession webSocketSession, ulong pokemonId, string requestID) - { - await Logic.Tasks.TransferPokemonTask.Execute(session, pokemonId); - } - } -} diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/EncodingHelper.cs b/PoGo.NecroBot.CLI/WebSocketHandler/EncodingHelper.cs index 156fcac14..8e60b0605 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/EncodingHelper.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/EncodingHelper.cs @@ -10,7 +10,6 @@ namespace PoGo.NecroBot.CLI.WebSocketHandler { class EncodingHelper { - public static string Serialize(dynamic evt) { var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All }; diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/EggListResponce.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/EggListResponce.cs similarity index 88% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/EggListResponce.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/EggListResponce.cs index 73d120f7d..bb794dde3 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/EggListResponce.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/EggListResponce.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events { public class EggListResponce : IWebSocketResponce { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/ItemListResponce.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/ItemListResponce.cs similarity index 88% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/ItemListResponce.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/ItemListResponce.cs index 84b20afa1..38595705b 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/ItemListResponce.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/ItemListResponce.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events { class ItemListResponce : IWebSocketResponce { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/PokemonListResponce.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/PokemonListResponce.cs similarity index 89% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/PokemonListResponce.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/PokemonListResponce.cs index c355be7b9..e6e34adf5 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/PokemonListResponce.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/PokemonListResponce.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events { public class PokemonListResponce : IWebSocketResponce, IEvent { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/TrainerProfileResponce.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/TrainerProfileResponce.cs similarity index 88% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/TrainerProfileResponce.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/TrainerProfileResponce.cs index 4a099e50c..379e4411e 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/TrainerProfileResponce.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/TrainerProfileResponce.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events { class TrainerProfileResponce : IWebSocketResponce { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/WebResponce.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/WebResponce.cs similarity index 82% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/WebResponce.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/WebResponce.cs index 1e87fe1d2..3658b2379 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Events/WebResponce.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Events/WebResponce.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events { public class WebResponce : IWebSocketResponce { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetEggListHandler.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetEggListHandler.cs similarity index 82% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetEggListHandler.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetEggListHandler.cs index 3b0be9c75..9744ecf23 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetEggListHandler.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetEggListHandler.cs @@ -1,4 +1,4 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks; using PoGo.NecroBot.Logic.State; using SuperSocket.WebSocket; using System; @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands { class GetEggListHandler : IWebSocketRequestHandler { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetItemsListHandler.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetItemsListHandler.cs similarity index 82% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetItemsListHandler.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetItemsListHandler.cs index 45cd96f1c..3d438e4c7 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetItemsListHandler.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetItemsListHandler.cs @@ -1,4 +1,4 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks; using PoGo.NecroBot.Logic.State; using SuperSocket.WebSocket; using System; @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands { class GetItemsListHandler : IWebSocketRequestHandler { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetPokemonListHandler.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetPokemonListHandler.cs similarity index 83% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetPokemonListHandler.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetPokemonListHandler.cs index f5bd8c2a2..0c37877b6 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetPokemonListHandler.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetPokemonListHandler.cs @@ -4,10 +4,10 @@ using System.Text; using System.Threading.Tasks; using SuperSocket.WebSocket; -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks; using PoGo.NecroBot.Logic.State; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands { public class GetPokemonListHandler : IWebSocketRequestHandler { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetPokemonSettingsHandler.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetPokemonSettingsHandler.cs similarity index 83% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetPokemonSettingsHandler.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetPokemonSettingsHandler.cs index 4a8e46423..e50e4e368 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetPokemonSettingsHandler.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetPokemonSettingsHandler.cs @@ -4,10 +4,10 @@ using System.Text; using System.Threading.Tasks; using SuperSocket.WebSocket; -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks; using PoGo.NecroBot.Logic.State; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands { public class GetPokemonSettingsHandler : IWebSocketRequestHandler { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetTrainerProfileHandler.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetTrainerProfileHandler.cs similarity index 83% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetTrainerProfileHandler.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetTrainerProfileHandler.cs index 5c810e7b1..54e179691 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/GetTrainerProfileHandler.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/GetTrainerProfileHandler.cs @@ -1,4 +1,4 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks; using PoGo.NecroBot.Logic.State; using SuperSocket.WebSocket; using System; @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands { class GetTrainerProfileHandler : IWebSocketRequestHandler { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/EggListWeb.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/EggListWeb.cs similarity index 78% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/EggListWeb.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/EggListWeb.cs index 0a6f7972f..2c6729d66 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/EggListWeb.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/EggListWeb.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Helpers { class EggListWeb { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/PokemonListWeb.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/PokemonListWeb.cs similarity index 89% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/PokemonListWeb.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/PokemonListWeb.cs index 86f21b1d0..a1551ac7b 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/PokemonListWeb.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/PokemonListWeb.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands { public class PokemonListWeb { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/TrainerProfileWeb.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/TrainerProfileWeb.cs similarity index 86% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/TrainerProfileWeb.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/TrainerProfileWeb.cs index cf15b59c3..72cf4b2d5 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Helpers/TrainerProfileWeb.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Helpers/TrainerProfileWeb.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Helpers { class TrainerProfileWeb { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetEggListTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetEggListTask.cs similarity index 85% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetEggListTask.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetEggListTask.cs index 029bce84c..e33681203 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetEggListTask.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetEggListTask.cs @@ -1,5 +1,5 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events; -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Helpers; using PoGo.NecroBot.Logic.State; using POGOProtos.Inventory.Item; using SuperSocket.WebSocket; @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks { class GetEggListTask { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetItemListTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetItemListTask.cs similarity index 80% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetItemListTask.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetItemListTask.cs index e3302d561..0cccf6589 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetItemListTask.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetItemListTask.cs @@ -1,4 +1,4 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events; using PoGo.NecroBot.Logic.State; using SuperSocket.WebSocket; using System; @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks { class GetItemListTask { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetPokemonListTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetPokemonListTask.cs similarity index 84% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetPokemonListTask.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetPokemonListTask.cs index 05d2c2bec..9b490de20 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetPokemonListTask.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetPokemonListTask.cs @@ -1,4 +1,4 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events; using PoGo.NecroBot.Logic.State; using SuperSocket.WebSocket; using System; @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks { class GetPokemonListTask { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetPokemonSettingsTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetPokemonSettingsTask.cs similarity index 83% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetPokemonSettingsTask.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetPokemonSettingsTask.cs index 13c0e8cab..9f376e271 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetPokemonSettingsTask.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetPokemonSettingsTask.cs @@ -1,4 +1,4 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events; using PoGo.NecroBot.Logic.State; using SuperSocket.WebSocket; using System; @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks { class GetPokemonSettingsTask { diff --git a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetTrainerProfileTask.cs b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetTrainerProfileTask.cs similarity index 78% rename from PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetTrainerProfileTask.cs rename to PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetTrainerProfileTask.cs index 1658adceb..528a284a8 100644 --- a/PoGo.NecroBot.CLI/WebSocketHandler/BasicGetCommands/Tasks/GetTrainerProfileTask.cs +++ b/PoGo.NecroBot.CLI/WebSocketHandler/GetCommands/Tasks/GetTrainerProfileTask.cs @@ -1,5 +1,5 @@ -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Events; -using PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Helpers; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Events; +using PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Helpers; using PoGo.NecroBot.Logic.State; using SuperSocket.WebSocket; using System; @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; -namespace PoGo.NecroBot.CLI.WebSocketHandler.BasicGetCommands.Tasks +namespace PoGo.NecroBot.CLI.WebSocketHandler.GetCommands.Tasks { class GetTrainerProfileTask {