dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Merge branch 'icons-1621' into v2.2.0b1

Browse Source 
# Conflicts:
#	eos/db/__init__.py
#	eos/db/gamedata/__init__.py
#	eos/db/gamedata/item.py
#	eos/gamedata.py
#	eve.db
This commit is contained in:
blitzmann
2018-06-12 21:43:28 -04:00
parent e19d231eba 19cf3c2036
commit 6fdcce12a3
1876 changed files with 188 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/attribute.py
View File

@@ -33,10 +33,10 @@ class Attribute(object):
@staticmethod
def getAttributeInfo(identity):
if isinstance(identity, (int, str)):
info = eos.db.getAttributeInfo(identity, eager=("icon", "unit"))
info = eos.db.getAttributeInfo(identity, eager=("unit"))
elif isinstance(identity, (int, float)):
id_ = int(identity)
info = eos.db.getAttributeInfo(id_, eager=("icon", "unit"))
info = eos.db.getAttributeInfo(id_, eager=("unit"))
else:
info = None
return info

2
service/fit.py
View File

@@ -95,7 +95,7 @@ class Fit(object):
fits = eos.db.getFitsWithShip(shipID)
names = []
for fit in fits:
names.append((fit.ID, fit.name, fit.booster, fit.modified or fit.created or datetime.datetime.fromtimestamp(fit.timestamp), fit.notes))
names.append((fit.ID, fit.name, fit.booster, fit.modified or fit.created or datetime.datetime.fromtimestamp(fit.timestamp), fit.notes, fit.ship.item.graphicID))
return names

14
service/market.py
View File

@@ -121,13 +121,13 @@ class SearchWorkerThread(threading.Thread):
if len(request) >= config.minItemSearchLength:
results = eos.db.searchItems(request, where=filter_,
join=(types_Item.group, types_Group.category),
eager=("icon", "group.category", "metaGroup", "metaGroup.parent"))
eager=("group.category", "metaGroup", "metaGroup.parent"))
jargon_results = []
if len(jargon_request) >= config.minItemSearchLength:
jargon_results = eos.db.searchItems(jargon_request, where=filter_,
join=(types_Item.group, types_Group.category),
eager=("icon", "group.category", "metaGroup", "metaGroup.parent"))
eager=("group.category", "metaGroup", "metaGroup.parent"))
items = set()
# Return only published items, consult with Market service this time
@@ -676,8 +676,8 @@ class Market(object):
def getIconByMarketGroup(self, mg):
"""Return icon associated to marketgroup"""
if mg.icon:
return mg.icon.iconFile
if mg.iconID:
return mg.iconID
else:
while mg and not mg.hasTypes:
mg = mg.parent
@@ -692,7 +692,7 @@ class Market(object):
except KeyError:
return ""
return item.icon.iconFile if item.icon else ""
return item.iconID if item.icon else ""
elif self.getMarketGroupChildren(mg) > 0:
kids = self.getMarketGroupChildren(mg)
mktGroups = self.getIconByMarketGroup(kids)
@@ -725,7 +725,7 @@ class Market(object):
"""
root = set()
for id_ in self.ROOT_MARKET_GROUPS:
mg = self.getMarketGroup(id_, eager="icon")
mg = self.getMarketGroup(id_)
root.add(mg)
return root
@@ -752,7 +752,7 @@ class Market(object):
filter_ = types_Category.name.in_(["Ship", "Structure"])
results = eos.db.searchItems(name, where=filter_,
join=(types_Item.group, types_Group.category),
eager=("icon", "group.category", "metaGroup", "metaGroup.parent"))
eager=("group.category", "metaGroup", "metaGroup.parent"))
ships = set()
for item in results:
if self.getPublicityByItem(item):