From e36b9661f0411af2d71d7eeb307579e36ec2748c Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 21 Feb 2019 16:50:10 +0300 Subject: [PATCH] Do not generate empty fetches when everything has been requested --- service/marketSources/evemarketdata.py | 3 ++- service/marketSources/evemarketer.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/service/marketSources/evemarketdata.py b/service/marketSources/evemarketdata.py index c05528989..3bfbc50c2 100644 --- a/service/marketSources/evemarketdata.py +++ b/service/marketSources/evemarketdata.py @@ -37,7 +37,8 @@ class EveMarketData: # Try selected system first self.fetchPrices(priceMap, max(2 * fetchTimeout / 3, 2), system) # If price was not available - try globally - self.fetchPrices(priceMap, max(fetchTimeout / 3, 2)) + if priceMap: + self.fetchPrices(priceMap, max(fetchTimeout / 3, 2)) def fetchPrices(self, priceMap, fetchTimeout, system=None): params = {"type_ids": ','.join(str(typeID) for typeID in priceMap)} diff --git a/service/marketSources/evemarketer.py b/service/marketSources/evemarketer.py index 894abcb83..1c4d08f1a 100644 --- a/service/marketSources/evemarketer.py +++ b/service/marketSources/evemarketer.py @@ -37,7 +37,8 @@ class EveMarketer: # Try selected system first self.fetchPrices(priceMap, max(2 * fetchTimeout / 3, 2), system) # If price was not available - try globally - self.fetchPrices(priceMap, max(fetchTimeout / 3, 2)) + if priceMap: + self.fetchPrices(priceMap, max(fetchTimeout / 3, 2)) def fetchPrices(self, priceMap, fetchTimeout, system=None): params = {"typeid": {typeID for typeID in priceMap}}