Merge branch 'master' of https://github.com/pyfa-org/Pyfa

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]
 

service/marketSources/evemarketer.py

@@ -22,13 +22,14 @@ 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
 
 pyfalog = Logger(__name__)
 
 
-class EveCentral(object):
+class EveMarketer(object):
 
     name = "evemarketer"
 
@@ -61,10 +62,10 @@ class EveCentral(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]
 
 
-Price.register(EveCentral)
+Price.register(EveMarketer)

service/price.py

@@ -26,6 +26,7 @@ import wx
 from logbook import Logger
 
 from eos import db
+from eos.saveddata.price import PriceStatus
 from service.fit import Fit
 from service.market import Market
 from service.network import TimeoutError
@@ -85,13 +86,18 @@ class Price(object):
         toRequest = set()
 
         # Compose list of items we're going to request
-        for typeID in priceMap:
+        for typeID in tuple(priceMap):
             # Get item object
             item = db.getItem(typeID)
             # We're not going to request items only with market group, as eve-central
             # doesn't provide any data for items not on the market
-            if item is not None and item.marketGroupID:
-                toRequest.add(typeID)
+            if item is None:
+                continue
+            if not item.marketGroupID:
+                priceMap[typeID].status = PriceStatus.notSupported
+                del priceMap[typeID]
+                continue
+            toRequest.add(typeID)
 
         # Do not waste our time if all items are not on the market
         if len(toRequest) == 0:
@@ -117,11 +123,10 @@ class Price(object):
             except TimeoutError:
                 # Timeout error deserves special treatment
                 pyfalog.warning("Price fetch timout")
-                for typeID in priceMap.keys():
+                for typeID in tuple(priceMap):
                     priceobj = priceMap[typeID]
                     priceobj.time = time.time() + TIMEOUT
-                    priceobj.failed = True
-
+                    priceobj.status = PriceStatus.fail
                     del priceMap[typeID]
             except Exception as ex:
                 # something happened, try another source
@@ -134,7 +139,7 @@ class Price(object):
         for typeID in priceMap.keys():
             priceobj = priceMap[typeID]
             priceobj.time = time.time() + REREQUEST
-            priceobj.failed = True
+            priceobj.status = PriceStatus.fail
 
     @classmethod
     def fitItemsList(cls, fit):
@@ -197,6 +202,7 @@ class Price(object):
 
 
 class PriceWorkerThread(threading.Thread):
+
     def __init__(self):
         threading.Thread.__init__(self)
         self.name = "PriceWorker"

service/settings.py

@@ -525,6 +525,7 @@ class ContextMenuSettings(object):
             "tacticalMode"          : 1,
             "targetResists"         : 1,
             "whProjector"           : 1,
+            "moduleFill"            : 1,
         }
 
         self.ContextMenuDefaultSettings = SettingsProvider.getInstance().getSettings("pyfaContextMenuSettings", ContextMenuDefaultSettings)