Fleetcarrier end point appears synced with fleetcarrier json

Author: robbyxp1

BaseUtilities/BaseUtilities/Misc.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Text;
 
 namespace BaseUtils
@@ -56,6 +57,46 @@ static public long InvariantParseLong(this string s, long def)
             else
                 return null;
         }
+
+        static public int? ToHex(this char c)
+        {
+            if (char.IsDigit(c))
+                return c - '0';
+            else if ("ABCDEF".Contains(c))
+                return c - 'A' + 10;
+            else if ("abcdef".Contains(c))
+                return c - 'a' + 10;
+            else
+                return null;
+        }
+
+        static public int? ToHex(this string s, int p)
+        {
+            if ( s.Length>p+1)
+            {
+                int? top = ToHex(s[p]);
+                int? bot = ToHex(s[p+1]);
+                if (top.HasValue && bot.HasValue)
+                    return (top << 4) | bot;
+            }
+            return null;
+        }
+
+        static public string FromHexString(this string ascii)
+        {
+            string s = "";
+            for( int i = 0; i < ascii.Length; i += 2)
+            {
+                int? v = ascii.ToHex(i);
+                if (v.HasValue)
+                    s += Convert.ToChar(v.Value);
+                else
+                    return null;
+            }
+
+            return s;
+        }
+
     }
 }
 

CAPI/EndPointBaseClass.cs

@@ -14,6 +14,7 @@
  * EDDiscovery is not affiliated with Frontier Developments plc.
  */
 
+using BaseUtils;
 using QuickJSON;
 using System;
 using System.Collections.Generic;
@@ -100,7 +101,7 @@ public class Ship
 
         protected List<OrdersCommoditySales> GetOrdersCommoditiesSales(JArray clist)     // may return null. Returns name, locName, price, stock
         {
-            if (clist != null)
+            if (clist != null && clist.Count > 0)
             {
                 var list = new List<OrdersCommoditySales>();
                 foreach (var kvp in clist)
@@ -118,7 +119,7 @@ public class Ship
 
         protected List<OrdersCommodityPurchases> GetOrdersCommoditiesPurchases(JArray clist)     // may return null. Returns name, locName, price, stock
         {
-            if (clist != null)
+            if (clist != null && clist.Count > 0)
             {
                 var list = new List<OrdersCommodityPurchases>();
                 foreach (var kvp in clist)
@@ -135,7 +136,7 @@ public class Ship
         }
         protected List<OrdersMRSales> GetOrdersMicroresourcesSales(JObject clist)     // may return null. Returns name, locName, price, stock
         {
-            if (clist != null)
+            if (clist != null && clist.Count > 0)
             {
                 var list = new List<OrdersMRSales>();
                 foreach (var kvp in clist)
@@ -152,7 +153,7 @@ public class Ship
         }
         protected List<OrdersMRPurchases> GetOrdersMicroresourcesPurchases(JArray clist)     // may return null. Returns name, locName, price, stock
         {
-            if (clist != null)
+            if (clist != null && clist.Count > 0)
             {
                 var list = new List<OrdersMRPurchases>();
                 foreach (var kvp in clist)
@@ -175,8 +176,8 @@ private OrdersCommoditySales OrdersCommoditySalesFromJSON(JObject data)
                 var m = new OrdersCommoditySales()
                 {
                     Name = data["name"].Str(),
-                    Stock = data["stock"].Long(),
-                    Price = data["price"].Long(),
+                    Stock = data["stock"].Str("0").InvariantParseLong(0),
+                    Price = data["price"].Str("0").InvariantParseLong(0),
                     Blackmarket = data["blackmarket"].Bool()
                 };
 
@@ -228,7 +229,7 @@ private OrdersMRSales OrdersMRSalesFromJSON(JObject data)
             {
                 var m = new OrdersMRSales()
                 {
-                    ID = data["ID"].Long(),
+                    ID = data["id"].Long(),
                     Name = data["name"].Str(),
                     LocName = data["locName"].Str(),
                     Price = data["price"].Long(),
@@ -243,7 +244,7 @@ private OrdersMRSales OrdersMRSalesFromJSON(JObject data)
 
         protected List<Commodity> GetCommodityList(JArray clist)
         {
-            if (clist != null)
+            if (clist != null && clist.Count>0)
             {
                 List<Commodity> list = new List<Commodity>();
                 foreach (var entry in clist)
@@ -288,7 +289,7 @@ private Commodity CommodityFromJSON(JObject data)
         protected Dictionary<string, double> GetEconomies(JObject data)
         {
             var list = new Dictionary<string, double>();
-            if (data != null)
+            if (data != null && data.Count>0)
             {
                 foreach (var e in data)
                     list.Add(e.Value["name"].Str("Unknown"), e.Value["proportion"].Double() * 100.0);
@@ -298,7 +299,7 @@ protected Dictionary<string, double> GetEconomies(JObject data)
         }
         protected List<Module> GetModules(JObject moduleslist)        // may be null if no shipyard
         {
-            if (moduleslist != null)
+            if (moduleslist != null && moduleslist.Count>0)
             {
                 List<Module> list = new List<Module>();
                 foreach (var kvp in moduleslist)
@@ -327,7 +328,7 @@ protected Dictionary<string, double> GetEconomies(JObject data)
 
         protected List<Ship> GetShips(JObject shiplist)        // may be null if no shipyard
         {
-            if (shiplist != null)
+            if (shiplist != null && shiplist.Count > 0)
             {
                 List<Ship> list = new List<Ship>();
                 foreach (var kvp in shiplist)