Refactor EDDN Responder and add support for all current schemas

MemphyKitay · Nov 13, 2022 · dd25a0a · dd25a0a
1 parent dc1ef8f
commit dd25a0a
Show file tree

Hide file tree

Showing 35 changed files with 2,060 additions and 879 deletions.
diff --git a/DataDefinitions/FleetCarrier.cs b/DataDefinitions/FleetCarrier.cs
@@ -406,6 +406,9 @@ string ConvertHexString(string hexString)
 
             // Station properties
             Market = FrontierApiStation.FromJson(newJson["market"]?.ToObject<JObject>(), null);
+            Market.commoditiesupdatedat = newTimeStamp;
+            Market.outfittingupdatedat = newTimeStamp;
+            Market.shipyardupdatedat = newTimeStamp;
 
             // Misc - Tritium stored in cargo
             foreach (var cargo in Cargo)

diff --git a/DataDefinitions/FrontierApiStation.cs b/DataDefinitions/FrontierApiStation.cs
@@ -142,8 +142,9 @@ List<ShipyardInfoItem> ShipyardFromProfile(JObject json)
                 List<ShipyardInfoItem> edShipyardShips = new List<ShipyardInfoItem>();
                 if (json?["ships"] != null)
                 {
-                    edShipyardShips = json?["ships"]["shipyard_list"].Children().Values()
-                        .Select(s => JsonConvert.DeserializeObject<ShipyardInfoItem>(s.ToString())).ToList();
+                    edShipyardShips = json["ships"]?["shipyard_list"]?.Children().Values()
+                        .Select(s => JsonConvert.DeserializeObject<ShipyardInfoItem>(s.ToString()))
+                        .ToList() ?? new List<ShipyardInfoItem>();
 
                     if (json["ships"]["unavailable_list"] != null)
                     {
@@ -169,7 +170,7 @@ List<ShipyardInfoItem> ShipyardFromProfile(JObject json)
                     lastStation.economyShares = EconomiesFromProfile(marketJson);
                     lastStation.eddnCommodityMarketQuotes = CommodityQuotesFromProfile(marketJson);
                     lastStation.prohibitedCommodities = ProhibitedCommoditiesFromProfile(marketJson);
-                    lastStation.commoditiesupdatedat = marketJson["timestamp"].ToObject<DateTime?>() ?? DateTime.MinValue;
+                    lastStation.commoditiesupdatedat = marketJson["timestamp"]?.ToObject<DateTime?>() ?? DateTime.MinValue;
                     lastStation.marketJson = marketJson;
 
                     List<KeyValuePair<string, string>> stationServices = new List<KeyValuePair<string, string>>();
@@ -187,8 +188,8 @@ List<ShipyardInfoItem> ShipyardFromProfile(JObject json)
                     lastStation.outfitting = OutfittingFromProfile(shipyardJson);
                     lastStation.ships = ShipyardFromProfile(shipyardJson);
                     lastStation.shipyardJson = shipyardJson;
-                    lastStation.outfittingupdatedat = shipyardJson["timestamp"].ToObject<DateTime?>() ?? DateTime.MinValue;
-                    lastStation.shipyardupdatedat = shipyardJson["timestamp"].ToObject<DateTime?>() ?? DateTime.MinValue;
+                    lastStation.outfittingupdatedat = shipyardJson["timestamp"]?.ToObject<DateTime?>() ?? DateTime.MinValue;
+                    lastStation.shipyardupdatedat = shipyardJson["timestamp"]?.ToObject<DateTime?>() ?? DateTime.MinValue;
                 }
             }
             catch (JsonException ex)

diff --git a/DataDefinitions/ModuleDefinitions.cs b/DataDefinitions/ModuleDefinitions.cs
@@ -1211,9 +1211,9 @@ static Module()
             "Hpt_MultiCannon_Fixed_Small_Strong", // Enforcer cannon 
             "Hpt_PulseLaser_Fixed_Medium_Disruptor", // Disruptor
         };
-        public bool IsPowerPlay()
+        public static bool IsPowerPlay(string edname)
         {
-            return PowerPlayModules.Contains(this.edname);
+            return PowerPlayModules.Contains(edname);
         }
 
         private static string NormalizedEDName(string rawEDName)

diff --git a/DataDefinitions/OutfittingInfo.cs b/DataDefinitions/OutfittingInfo.cs
@@ -1,7 +1,5 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using Utilities;
 
 namespace EddiDataDefinitions
 {

diff --git a/EDDI/ChangeLog.md b/EDDI/ChangeLog.md
@@ -11,6 +11,8 @@ Full details of the variables available for each noted event, and VoiceAttack in
   * Crime Monitor
     * Fixed a bug that could identify a fleet carrier as a faction station.
     * Moved navigation functions to the Navigation Monitor
+  * EDDN Responder
+    * Updated schema support to include all current schemas from https://github.com/EDCD/EDDN/tree/master/schemas.
   * Inara Responder
     * Fixed an issue with asset data not being reported correctly.
   * Material Monitor

diff --git a/EDDNResponder/EDDNEconomy.cs b/EDDNResponder/EDDNEconomy.cs
@@ -1,6 +1,6 @@
 using EddiDataDefinitions;
 
-namespace EDDNResponder
+namespace EddiEddnResponder
 {
     class EDDNEconomy
     {

diff --git a/EDDNResponder/EDDNHeader.cs b/EDDNResponder/EDDNHeader.cs