Merge pull request NecronomiconCoding#1439 from nicoschmitt/master

WebSocket Respond to EggsListEvent

PoGo.NecroBot.CLI/WebSocketInterface.cs

@@ -78,7 +78,15 @@ private void HandleEvent(ProfileEvent evt)
 
         private async void HandleMessage(WebSocketSession session, string message)
         {
-            if (message == "PokemonList") await Logic.Tasks.PokemonListTask.Execute(_session);
+            switch (message)
+            {
+                case "PokemonList":
+                    await Logic.Tasks.PokemonListTask.Execute(_session);
+                    break;
+                case "EggsList":
+                    await Logic.Tasks.EggsListTask.Execute(_session);
+                    break;
+            }
         }
 
         private void HandleSession(WebSocketSession session)

PoGo.NecroBot.Logic/Event/EggsListEvent.cs

@@ -0,0 +1,17 @@
+#region using directives
+
+using System;
+using System.Collections.Generic;
+using POGOProtos.Data;
+using POGOProtos.Inventory;
+
+#endregion
+
+namespace PoGo.NecroBot.Logic.Event
+{
+    public class EggsListEvent : IEvent
+    {
+        public List<EggIncubator> Incubators { get; set; }
+        public object UnusedEggs { get; set; }
+    }
+}

PoGo.NecroBot.Logic/Tasks/EggsListTask.cs

@@ -0,0 +1,38 @@
+#region using directives
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using PoGo.NecroBot.Logic.DataDumper;
+using PoGo.NecroBot.Logic.Event;
+using PoGo.NecroBot.Logic.PoGoUtils;
+using PoGo.NecroBot.Logic.State;
+using POGOProtos.Inventory.Item;
+
+#endregion
+
+namespace PoGo.NecroBot.Logic.Tasks
+{
+    public class EggsListTask
+    {
+        public static async Task Execute(ISession session)
+        {
+            var incubators = (await session.Inventory.GetEggIncubators())
+                .Where(x => x.UsesRemaining > 0 || x.ItemId == ItemId.ItemIncubatorBasicUnlimited)
+                .OrderByDescending(x => x.ItemId == ItemId.ItemIncubatorBasicUnlimited)
+                .ToList();
+
+            var unusedEggs = (await session.Inventory.GetEggs())
+                .Where(x => string.IsNullOrEmpty(x.EggIncubatorId))
+                .OrderBy(x => x.EggKmWalkedTarget - x.EggKmWalkedStart)
+                .ToList();
+
+            session.EventDispatcher.Send(
+                new EggsListEvent
+                {
+                    Incubators = incubators,
+                    UnusedEggs = unusedEggs
+                });
+        }
+    }
+}