From fe0266e5171ea0371a7db1e0fa0d04e39ce81a0e Mon Sep 17 00:00:00 2001 From: MaruMaruOO Date: Thu, 19 Jul 2018 05:40:18 -0400 Subject: [PATCH] Added mitigation for outdated forced groupMarketIDs --- service/market.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/service/market.py b/service/market.py index 9035512d9..545b1a66f 100644 --- a/service/market.py +++ b/service/market.py @@ -527,7 +527,7 @@ class Market(object): categories = ['Drone', 'Fighter', 'Implant'] for item in items: - if True and item.category.ID == 20 and item.group.ID != 303: # Implants not Boosters + if item.category.ID == 20 and item.group.ID != 303: # Implants not Boosters implant_remove_list = set() implant_remove_list.add("Low-Grade ") implant_remove_list.add("Low-grade ") @@ -647,6 +647,12 @@ class Market(object): def marketGroupHasTypesCheck(self, mg): """If market group has any items, return true""" if mg and mg.ID in self.ITEMS_FORCEDMARKETGROUP_R: + # This shouldn't occur normally but makes errors more mild when ITEMS_FORCEDMARKETGROUP is outdated. + if len(mg.children) > 0 and len(mg.items) == 0: + pyfalog.error(("Market group \"{0}\" contains no items and has children. " + "ITEMS_FORCEDMARKETGROUP is likely outdated and will need to be " + "updated for {1} to display correctly.").format(mg, self.ITEMS_FORCEDMARKETGROUP_R[mg.ID])) + return False return True elif len(mg.items) > 0: return True