Fixed single station information reloader

Fi0x · Dec 1, 2022 · d9b7c74 · d9b7c74
1 parent 5c04415
commit d9b7c74
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/src/main/java/com/fi0x/edct/logic/cleanup/HTMLCleanup.java b/src/main/java/com/fi0x/edct/logic/cleanup/HTMLCleanup.java
@@ -12,28 +12,33 @@ public class HTMLCleanup
 {
     public static ArrayList<Element> getStationTrades(String inputHTML)
     {
-        //TODO: Adjust for new inara
         ArrayList<Element> stationTrades = new ArrayList<>();
 
         Document doc = Jsoup.parse(inputHTML);
+        Element mainContainer = doc.getElementsByClass("maincontainer").first();
 
-        Element mainconten1s = doc.getElementsByClass("maincontainer").first();
+        Elements mainContents = Objects.requireNonNull(mainContainer).getElementsByClass("maincontent0");
+        if(mainContents.size() == 0)
+            return null;
 
-        assert mainconten1s != null;
-        Elements mainblocks = mainconten1s.getElementsByClass("mainblock maintable");
-        if(mainblocks.size() == 0) return null;
+        Elements mainBlocks = Objects.requireNonNull(mainContents.first()).getElementsByClass("mainblock");
+        if(mainBlocks.size() == 0)
+            return null;
 
-        Elements tables = Objects.requireNonNull(mainblocks.first()).getElementsByTag("table");
-        if(tables.size() == 0) return null;
+        Elements tables = Objects.requireNonNull(mainBlocks.last()).getElementsByTag("table");
+        if(tables.size() == 0)
+            return null;
 
         Elements bodies = Objects.requireNonNull(tables.first()).getElementsByTag("tbody");
-        if(bodies.size() == 0) return null;
+        if(bodies.size() == 0)
+            return null;
 
         Elements rows = Objects.requireNonNull(bodies.first()).getElementsByTag("tr");
 
         for(Element row : rows)
         {
-            if(row.hasClass("subheader")) continue;
+            if(row.className().contains("subheader"))
+                continue;
             stationTrades.add(row);
         }
 

diff --git a/src/main/java/com/fi0x/edct/logic/cleanup/INARACleanup.java b/src/main/java/com/fi0x/edct/logic/cleanup/INARACleanup.java
@@ -161,16 +161,17 @@ public static ArrayList<TRADE> getCommodityTradesForStation(String inputHTML, St
         ArrayList<TRADE> results = new ArrayList<>();
 
         ArrayList<Element> stationCommodities = HTMLCleanup.getStationTrades(inputHTML);
-        if(stationCommodities == null) return results;
+        if(stationCommodities == null)
+            return results;
 
         long currentMillis = System.currentTimeMillis();
         for(Element commodity : stationCommodities)
         {
             Elements cols = commodity.getElementsByTag("td");
             int inaraID = getIntFromString(Objects.requireNonNull(cols.get(0).getElementsByTag("a").first()).attr("href"));
             int importPrice = getIntFromString(Objects.requireNonNull(cols.get(1).getElementsByTag("span").first()).ownText());
-            int exportPrice = getIntFromString(Objects.requireNonNull(cols.get(2).getElementsByTag("span").first()).ownText());
-            int demand = getIntFromString(cols.get(3).ownText());
+            int demand = getIntFromString(cols.get(2).ownText());
+            int exportPrice = getIntFromString(Objects.requireNonNull(cols.get(3).getElementsByTag("span").first()).ownText());
             int supply = getIntFromString(cols.get(4).ownText());
 
             STATION s = DBHandler.getStation(systemName, stationName);
@@ -182,8 +183,9 @@ public static ArrayList<TRADE> getCommodityTradesForStation(String inputHTML, St
 
     private static int getIntFromString(String input)
     {
-        String cleanString = input.replace("commodity", "").replace("/", "");
+        String cleanString = input.replace("elite/commodity", "").replace("/", "");
         cleanString = cleanString.replace("-", "0").replace(",", "");
+        cleanString = cleanString.replace("Cr", "");
 
         if(cleanString.equals("")) return 0;
         return Integer.parseInt(cleanString);

diff --git a/src/main/java/com/fi0x/edct/logic/structures/ENDPOINTS.java b/src/main/java/com/fi0x/edct/logic/structures/ENDPOINTS.java
@@ -8,6 +8,7 @@ public enum ENDPOINTS
     Prices("https://inara.cz/commodities/", "GET", "pi1", "pi2", "pi3", "pi4", "pi5", "pi7", "pi8", "pi9", "pi10", "pi11", "pi12"),
     StationSearch("https://inara.cz/elite/stations/", "GET", "search"),
     StationInfo("https://inara.cz/elite/station/", "GET"),
+    StationMarket("https://inara.cz/elite/station-market/", "GET"),
     EDSMCoordinates("https://www.edsm.net/api-v1/system", "GET", "systemName", "showCoordinates");
 
     public final String url;

diff --git a/src/main/java/com/fi0x/edct/logic/threads/EDDNHandler.java b/src/main/java/com/fi0x/edct/logic/threads/EDDNHandler.java
@@ -107,7 +107,7 @@ private void retrieveStationInterrupted(String outputString)
                     counter++;
                     try
                     {
-                        html = InaraStation.getStationHtml(stationID);
+                        html = InaraStation.getStationInfoHtml(stationID);
                         break;
                     } catch(HtmlConnectionException ignored)
                     {

diff --git a/src/main/java/com/fi0x/edct/logic/websites/InaraStation.java b/src/main/java/com/fi0x/edct/logic/websites/InaraStation.java
@@ -24,19 +24,18 @@ public static String getInaraStationID(String stationName, String systemName) th
         return INARACleanup.getStationID(html, stationName, systemName);
     }
 
-    public static String getStationHtml(String stationID) throws InterruptedException, HtmlConnectionException
+    public static String getStationInfoHtml(String stationID) throws InterruptedException, HtmlConnectionException
     {
         return RequestHandler.sendHTTPRequest(ENDPOINTS.StationInfo.url + stationID, ENDPOINTS.StationInfo.type, new HashMap<>());
     }
 
     public static void updateSingleStationTrades(String stationName, String systemName, TRADE tradeToUpdate)
     {
-        //TODO: Update for new inara
         String stationHTML = null;
         try
         {
             String inaraID = getInaraStationID(stationName, systemName);
-            stationHTML = getStationHtml(inaraID);
+            stationHTML = RequestHandler.sendHTTPRequest(ENDPOINTS.StationMarket.url + inaraID, ENDPOINTS.StationMarket.type, new HashMap<>());
         } catch(InterruptedException | HtmlConnectionException ignored)
         {
         }
@@ -56,7 +55,6 @@ public static void updateSingleStationTrades(String stationName, String systemNa
                     tradeToUpdate.EXPORT_PRICE = t.EXPORT_PRICE;
                 }
             }
-
         }
     }