Merge branch 'bug/1278' of https://github.com/pyfa-org/Pyfa into bug/1278

This commit is contained in:
blitzmann
2017-09-23 12:49:05 -04:00
2 changed files with 13 additions and 3 deletions

View File

@@ -25,8 +25,10 @@ from eos.saveddata.price import Price
prices_table = Table("prices", saveddata_meta,
Column("typeID", Integer, primary_key=True),
Column("price", Float),
Column("price", Float, default=0.0),
Column("time", Integer, nullable=False),
Column("failed", Integer))
mapper(Price, prices_table)
mapper(Price, prices_table, properties={
"_Price__price": prices_table.c.price,
})

View File

@@ -30,7 +30,7 @@ class Price(object):
def __init__(self, typeID):
self.typeID = typeID
self.time = 0
self.price = 0
self.__price = 0
self.failed = None
@reconstructor
@@ -40,3 +40,11 @@ class Price(object):
@property
def isValid(self):
return self.time >= time.time()
@property
def price(self):
return self.__price or 0.0
@price.setter
def price(self, price):
self.__price = price