dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Add validity override of 2 hours for prices

Browse Source
This commit is contained in:
DarkPhoenix
2019-02-25 08:43:27 +03:00
parent b9e68504ed
commit ed24e7a2a3
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eos/saveddata/price.py
View File

@@ -49,14 +49,13 @@ class Price(object):
self.price = 0
self.status = PriceStatus.initialized
@property
def isValid(self):
def isValid(self, validityOverride=None):
# Always attempt to update prices which were just initialized, and prices
# of unsupported items (maybe we start supporting them at some point)
if self.status in (PriceStatus.initialized, PriceStatus.notSupported):
return False
elif self.status == PriceStatus.fetchSuccess:
return time() <= self.time + VALIDITY
return time() <= self.time + (validityOverride if validityOverride is not None else VALIDITY)
elif self.status == PriceStatus.fetchFail:
return time() <= self.time + REREQUEST
elif self.status == PriceStatus.fetchTimeout:

2
gui/builtinViewColumns/price.py
View File

@@ -63,7 +63,7 @@ class Price(ViewColumn):
priceObj = stuff.item.price
if not priceObj.isValid:
if not priceObj.isValid():
return False
return formatPrice(stuff, priceObj)

2
service/port/multibuy.py
View File

@@ -78,7 +78,7 @@ def exportMultiBuy(fit, options, callback):
callback(string)
priceSvc = sPrc.getInstance()
priceSvc.findCheaperReplacements(itemAmounts, cb)
priceSvc.findCheaperReplacements(itemAmounts, cb, includeBetter=True)
else:
string = _prepareString(fit.ship.item, itemAmounts)
if callback:

21
service/price.py
View File

@@ -66,7 +66,7 @@ class Price:
return cls.instance
@classmethod
def fetchPrices(cls, prices, fetchTimeout):
def fetchPrices(cls, prices, fetchTimeout, validityOverride):
"""Fetch all prices passed to this method"""
# Dictionary for our price objects
@@ -74,7 +74,7 @@ class Price:
# Check all provided price objects, and add those we want to update to
# dictionary
for price in prices:
if not price.isValid:
if not price.isValid(validityOverride):
priceMap[price.typeID] = price
if not priceMap:
@@ -175,7 +175,7 @@ class Price:
return item.price.price
def getPrices(self, objitems, callback, fetchTimeout=30, waitforthread=False):
def getPrices(self, objitems, callback, fetchTimeout=30, waitforthread=False, validityOverride=None):
"""Get prices for multiple typeIDs"""
requests = []
sMkt = Market.getInstance()
@@ -195,7 +195,7 @@ class Price:
if waitforthread:
self.priceWorkerThread.setToWait(requests, cb)
else:
self.priceWorkerThread.trigger(requests, cb, fetchTimeout)
self.priceWorkerThread.trigger(requests, cb, fetchTimeout, validityOverride)
def clearPriceCache(self):
pyfalog.debug("Clearing Prices")
@@ -226,8 +226,9 @@ class Price:
pyfalog.critical("Execution of callback from findCheaperReplacements failed.")
pyfalog.critical(e)
# TODO: add validity override
self.getPrices(itemsToFetch, cb, fetchTimeout=fetchTimeout)
# Prices older than 2 hours have to be refetched
validityOverride = 2 * 60 * 60
self.getPrices(itemsToFetch, cb, fetchTimeout=fetchTimeout, validityOverride=validityOverride)
class PriceWorkerThread(threading.Thread):
@@ -243,11 +244,11 @@ class PriceWorkerThread(threading.Thread):
queue = self.queue
while True:
# Grab our data
callback, requests, fetchTimeout = queue.get()
callback, requests, fetchTimeout, validityOverride = queue.get()
# Grab prices, this is the time-consuming part
if len(requests) > 0:
Price.fetchPrices(requests, fetchTimeout)
Price.fetchPrices(requests, fetchTimeout, validityOverride)
wx.CallAfter(callback)
queue.task_done()
@@ -259,8 +260,8 @@ class PriceWorkerThread(threading.Thread):
for callback in callbacks:
wx.CallAfter(callback)
def trigger(self, prices, callbacks, fetchTimeout):
self.queue.put((callbacks, prices, fetchTimeout))
def trigger(self, prices, callbacks, fetchTimeout, validityOverride):
self.queue.put((callbacks, prices, fetchTimeout, validityOverride))
def setToWait(self, prices, callback):
for price in prices: