Fixed DB error

Fi0x · Dec 7, 2022 · c12783e · c12783e
1 parent 07da31f
commit c12783e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/main/java/com/fi0x/edct/logic/database/DBHandler.java b/src/main/java/com/fi0x/edct/logic/database/DBHandler.java
@@ -154,10 +154,10 @@ public static ArrayList<Integer> getCommodityIDs(boolean onlyMissing, long minAv
         {
             while(results != null && results.next())
             {
-                String name = results.getString("CommodityName");
-                if(BlacklistHandler.getBlacklistedCommodities().contains(name))
+                int id = results.getInt("InaraID");
+                if(BlacklistHandler.isIDBlacklisted(id))
                     continue;
-                ids.add(results.getInt("InaraID"));
+                ids.add(id);
             }
         } catch(Exception e)
         {

diff --git a/src/main/java/com/fi0x/edct/logic/filesystem/BlacklistHandler.java b/src/main/java/com/fi0x/edct/logic/filesystem/BlacklistHandler.java
@@ -2,6 +2,7 @@
 
 import com.fi0x.edct.Main;
 import com.fi0x.edct.logging.LogName;
+import com.fi0x.edct.logic.database.DBHandler;
 import io.fi0x.javalogger.logging.Logger;
 
 import java.io.BufferedReader;
@@ -15,6 +16,7 @@
 
 public class BlacklistHandler
 {
+    private static ArrayList<Integer> BLACKLISTED_IDS = null;
     public static ArrayList<String> getBlacklistSystems()
     {
         ArrayList<String> blacklistedStations = new ArrayList<>();
@@ -38,7 +40,14 @@ public static ArrayList<String> getBlacklistSystems()
 
         return blacklistedStations;
     }
-    public static ArrayList<String> getBlacklistedCommodities()
+    public static boolean isIDBlacklisted(int id)
+    {
+        if(BLACKLISTED_IDS == null)
+            generateBlacklistedCommodityIDs();
+        return BLACKLISTED_IDS.contains(id);
+    }
+
+    private static void generateBlacklistedCommodityIDs()
     {
         ArrayList<String> blacklistedCommodities = new ArrayList<>();
         try
@@ -59,7 +68,9 @@ public static ArrayList<String> getBlacklistedCommodities()
             Logger.log("Could not read the blacklist", LogName.WARNING, e, 992);
         }
 
-        return blacklistedCommodities;
+        BLACKLISTED_IDS = new ArrayList<>();
+        for(String commodity : blacklistedCommodities)
+            BLACKLISTED_IDS.add(DBHandler.getCommodityIDByName(commodity));
     }
 
     public static void addSystemToBlacklist(String systemName)