From 73d9dd60e69363ffa6d9333e8992c66c49f8781d Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Thu, 21 Sep 2017 21:13:05 -0400 Subject: [PATCH 1/4] Don't return None as a price, always return a float (#1291) (#1292) --- eos/db/saveddata/price.py | 6 ++++-- eos/saveddata/price.py | 10 +++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/eos/db/saveddata/price.py b/eos/db/saveddata/price.py index 2135d20cf..8be7f6519 100644 --- a/eos/db/saveddata/price.py +++ b/eos/db/saveddata/price.py @@ -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, +}) diff --git a/eos/saveddata/price.py b/eos/saveddata/price.py index 304d6fedd..6618119d0 100644 --- a/eos/saveddata/price.py +++ b/eos/saveddata/price.py @@ -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 From ce5803dd9cedc9b22f8028b60e7c97f184e6767a Mon Sep 17 00:00:00 2001 From: blitzmann Date: Fri, 22 Sep 2017 02:33:46 -0400 Subject: [PATCH 2/4] Disable an odd bit of code from a long time ago that fitting max group fitting restrictions to be bypassed (#1278) --- eos/saveddata/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 2b1d2665c..1e2999249 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -457,7 +457,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): # Check max group fitted max = self.getModifiedItemAttr("maxGroupFitted") if max is not None: - current = 0 if self.owner != fit else -1 + # current = 0 if self.owner != fit else -1 # Disabled, see #1278 for mod in fit.modules: if mod.item and mod.item.groupID == self.item.groupID: current += 1 From 7729bd9210910c1669c1ef99ec34d6fb3700b314 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Fri, 22 Sep 2017 02:35:01 -0400 Subject: [PATCH 3/4] Opps commented wrong thing --- eos/saveddata/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 1e2999249..2bca09ea6 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -457,7 +457,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): # Check max group fitted max = self.getModifiedItemAttr("maxGroupFitted") if max is not None: - # current = 0 if self.owner != fit else -1 # Disabled, see #1278 + current = 0 # if self.owner != fit else -1 # Disabled, see #1278 for mod in fit.modules: if mod.item and mod.item.groupID == self.item.groupID: current += 1 From 0134c3b9a173ed3b818acfff9f72ed65430c49d4 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 23 Sep 2017 12:33:51 -0400 Subject: [PATCH 4/4] Fix formatting --- eos/saveddata/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 2bca09ea6..40c875a18 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -457,7 +457,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): # Check max group fitted max = self.getModifiedItemAttr("maxGroupFitted") if max is not None: - current = 0 # if self.owner != fit else -1 # Disabled, see #1278 + current = 0 # if self.owner != fit else -1 # Disabled, see #1278 for mod in fit.modules: if mod.item and mod.item.groupID == self.item.groupID: current += 1