From 0dd98330aaea40b19b5c1c05be1578841b892e0f Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 9 Dec 2015 20:54:29 -0500 Subject: [PATCH] Fix issue with old item in market service causing error due to being non-existent. --- eos/db/gamedata/queries.py | 3 ++- service/market.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py index 93c43fc38..fa7ce3ff3 100644 --- a/eos/db/gamedata/queries.py +++ b/eos/db/gamedata/queries.py @@ -83,7 +83,8 @@ def getItem(lookfor, eager=None): else: # Item names are unique, so we can use first() instead of one() item = gamedata_session.query(Item).options(*processEager(eager)).filter(Item.name == lookfor).first() - itemNameMap[lookfor] = item.ID + if item: + itemNameMap[lookfor] = item.ID else: raise TypeError("Need integer or string as argument") return item diff --git a/service/market.py b/service/market.py index 9abed103c..4ce8c8806 100644 --- a/service/market.py +++ b/service/market.py @@ -504,8 +504,10 @@ class Market(): parents.add(parent) # Check for overrides and add them if any if parent.name in self.ITEMS_FORCEDMETAGROUP_R: - for itmn in self.ITEMS_FORCEDMETAGROUP_R[parent.name]: - variations.add(self.getItem(itmn)) + for item in self.ITEMS_FORCEDMETAGROUP_R[parent.name]: + i = self.getItem(item) + if i: + variations.add(i) # Add all parents to variations set variations.update(parents) # Add all variations of parents to the set