From 2dca9fc3f333054fab105a1f76f37cc028ac7f6b Mon Sep 17 00:00:00 2001 From: blitzman Date: Mon, 13 Feb 2017 22:27:03 -0500 Subject: [PATCH] Fix stuff in system pricing feature --- .../pyfaGeneralPreferences.py | 1 - service/price.py | 15 ++++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py index d084f1b93..df7f4f50d 100644 --- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py +++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py @@ -196,7 +196,6 @@ class PFGeneralPref(PreferenceView): def onPriceSelection(self, event): system = self.chPriceSystem.GetString(self.chPriceSystem.GetSelection()) - Price.currentSystemId = Price.systemsList.get(system) self.sFit.serviceFittingOptions["priceSystem"] = system fitID = self.mainFrame.getActiveFit() diff --git a/service/price.py b/service/price.py index cafe7f5d0..bcbaf5971 100644 --- a/service/price.py +++ b/service/price.py @@ -23,6 +23,7 @@ from xml.dom import minidom from eos import db from service.network import Network, TimeoutError +from service.fit import Fit VALIDITY = 24 * 60 * 60 # Price validity period, 24 hours REREQUEST = 4 * 60 * 60 # Re-request delay for failed fetches, 4 hours @@ -38,8 +39,6 @@ class Price(object): "Hek": 30002053 } - currentSystemId = "" - @classmethod def invalidPrices(self, prices): for price in prices: @@ -78,9 +77,10 @@ class Price(object): # This will store POST data for eve-central data = [] + sFit = Fit.getInstance() # Base request URL baseurl = "https://eve-central.com/api/marketstat" - data.append(("usesystem", Price.currentSystemId)) # Use Jita for market + data.append(("usesystem", cls.systemsList[sFit.serviceFittingOptions["priceSystem"]])) # Use Jita for market for typeID in toRequest: # Add all typeID arguments data.append(("typeid", typeID)) @@ -140,15 +140,12 @@ class Price(object): typeIDs.append(mod.itemID) for drone in fit.drones: - for _ in xrange(drone.amount): - typeIDs.append(drone.itemID) + typeIDs.append(drone.itemID) for fighter in fit.fighters: - for _ in xrange(fighter.amountActive): - typeIDs.append(fighter.itemID) + typeIDs.append(fighter.itemID) for cargo in fit.cargo: - for _ in xrange(cargo.amount): - typeIDs.append(cargo.itemID) + typeIDs.append(cargo.itemID) return typeIDs \ No newline at end of file