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

Allow to customize fetch timeout when requesting prices

Browse Source
This commit is contained in:
DarkPhoenix
2019-02-19 20:40:03 +03:00
parent 7aba11142f
commit 7ac24ff7ee
7 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/marketSources/evemarketdata.py
View File

@@ -33,14 +33,14 @@ class EveMarketData:
name = "eve-marketdata.com"
def __init__(self, priceMap, system, timeout):
def __init__(self, priceMap, system, fetchTimeout):
data = {}
baseurl = "https://eve-marketdata.com/api/item_prices.xml"
data["system_id"] = system
data["type_ids"] = ','.join(str(typeID) for typeID in priceMap)
network = Network.getInstance()
data = network.request(baseurl, network.PRICES, params=data, timeout=timeout)
data = network.request(baseurl, network.PRICES, params=data, timeout=fetchTimeout)
xml = minidom.parseString(data.text)
types = xml.getElementsByTagName("eve").item(0).getElementsByTagName("price")

4
service/marketSources/evemarketer.py
View File

@@ -33,7 +33,7 @@ class EveMarketer:
name = "evemarketer"
def __init__(self, priceMap, system, timeout):
def __init__(self, priceMap, system, fetchTimeout):
data = {}
baseurl = "https://api.evemarketer.com/ec/marketstat"
@@ -41,7 +41,7 @@ class EveMarketer:
data["typeid"] = {typeID for typeID in priceMap}
network = Network.getInstance()
data = network.request(baseurl, network.PRICES, params=data, timeout=timeout)
data = network.request(baseurl, network.PRICES, params=data, timeout=fetchTimeout)
xml = minidom.parseString(data.text)
types = xml.getElementsByTagName("marketstat").item(0).getElementsByTagName("type")
# Cycle through all types we've got from request