From 436113dedce62bf11ac7e3760da4a9180c4e4647 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 13 Feb 2019 18:51:44 +0300 Subject: [PATCH] Set price object status on successful fetches --- service/marketSources/evemarketdata.py | 5 +++-- service/marketSources/evemarketer.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/service/marketSources/evemarketdata.py b/service/marketSources/evemarketdata.py index bd1f8f3af..15edc92ef 100644 --- a/service/marketSources/evemarketdata.py +++ b/service/marketSources/evemarketdata.py @@ -22,6 +22,7 @@ from xml.dom import minidom from logbook import Logger +from eos.saveddata.price import PriceStatus from service.network import Network from service.price import Price, TIMEOUT, VALIDITY @@ -52,6 +53,7 @@ class EveMarketData(object): price = float(type_.firstChild.data) except (TypeError, ValueError): pyfalog.warning("Failed to get price for: {0}", type_) + continue # Fill price data priceobj = priceMap[typeID] @@ -61,11 +63,10 @@ class EveMarketData(object): if price != 0: priceobj.price = price priceobj.time = time.time() + VALIDITY + priceobj.status = PriceStatus.success else: priceobj.time = time.time() + TIMEOUT - priceobj.failed = None - # delete price from working dict del priceMap[typeID] diff --git a/service/marketSources/evemarketer.py b/service/marketSources/evemarketer.py index 2418d10c5..478de4371 100644 --- a/service/marketSources/evemarketer.py +++ b/service/marketSources/evemarketer.py @@ -22,6 +22,7 @@ from xml.dom import minidom from logbook import Logger +from eos.saveddata.price import PriceStatus from service.network import Network from service.price import Price, VALIDITY @@ -61,7 +62,7 @@ class EveMarketer(object): priceobj = priceMap[typeID] priceobj.price = percprice priceobj.time = time.time() + VALIDITY - priceobj.failed = None + priceobj.status = PriceStatus.success # delete price from working dict del priceMap[typeID]